Back to Home / #openttd / 2018 / 06 / Prev Day | Next Day
#openttd IRC Logs for 2018-06-03

---Logopened Sun Jun 03 00:00:38 2018
00:01-!-snail_UES_ [~snail_UES@cpe-98-14-137-148.nyc.res.rr.com] has quit [Quit: snail_UES_]
00:29-!-supermop_ [~supermop@pool-71-105-33-106.nycmny.fios.verizon.net] has quit [Ping timeout: 480 seconds]
01:07-!-techmagus [~Laibeus_L@00022bb9.user.oftc.net] has quit [Remote host closed the connection]
01:29-!-techmagus [~Laibeus_L@69.51.16.249] has joined #openttd
01:29-!-techmagus is "Yahanan Xie" on #openttd #tor #/r/openttd
01:33-!-chomwitt is "chomwitt" on #debian #debian-games
01:33-!-chomwitt [~chomwitt@2a02:587:dc08:d500:dce0:210d:9649:b12e] has joined #openttd
01:39-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has quit [Read error: Connection reset by peer]
01:39-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has joined #openttd
01:39-!-Supercheese is "Supercheese" on #openttd
01:44-!-HeyCitizen_ [~HeyCitize@sttrpq3809w-lp130-03-67-68-202-204.dsl.bell.ca] has joined #openttd
01:44-!-HeyCitizen_ is "Got ZNC?" on #openttd #/r/openttd
01:46-!-HeyCitizen [~HeyCitize@ip-45-41-54-196.montreal.ca.northamericancoax.com] has quit [Ping timeout: 480 seconds]
02:32-!-andythenorth [~andytheno@217.33.116.190] has joined #openttd
02:32-!-andythenorth is "andythenorth" on #openttd
02:35-!-Supercheese [~Superchee@cpe-98-146-230-183.natnow.res.rr.com] has quit [Quit: Valete omnes]
02:47<andythenorth>moin
02:59-!-sla_ro|master [~sla.ro@78.96.209.89] has joined #openttd
02:59-!-sla_ro|master is "slamaster" on #sla #openttd
03:14<peter1138>hi
03:14<peter1138>have you figured out git yet? :p
03:15<andythenorth>reading the docs
03:15<andythenorth>also trying stuff :P
03:15<andythenorth>not sure what the goal is, think I want your branch in my repo
03:15<andythenorth>can't just PR your branch, because then I can't make fixes
03:15<andythenorth>I now have https://github.com/andythenorth/OpenTTD/commits/nrt-block
03:16<andythenorth>I merged master in, which might be unwanted, but eh
03:17<andythenorth>I'm making a PR to see what it looks like :P
03:17<peter1138>Yes, it's unwanted. That's what messed up the original nrt!
03:17<peter1138>You literally just checkout the branch. And then that's it. You have it.
03:17<andythenorth>well...then you have to give me commit rights on your repo
03:18<andythenorth>which isn't good
03:18<peter1138>No I don't.
03:18<andythenorth>ok I go round again, until it works
03:18<peter1138>git checkout -b nrt-block petern/nrt-block
03:18<peter1138>git push andythenorth/nrt-block
03:19<andythenorth>yes
03:19<peter1138>(remove local nrt-block and andythenorth:nrt-block first, cos it's already messed up)
03:19<andythenorth>so far so good
03:19<peter1138>git push andythenort nrt-block, sorry
03:19<peter1138>+h
03:20<andythenorth>ok, so why doesn't that immediately get failed as 'behind master'?
03:20<peter1138>why would it?
03:21<peter1138>it's not an offence to be behind master.
03:21<andythenorth>ok
03:21-!-nielsm [~nielsm@80-162-205-79-cable.dk.customer.tdc.net] has joined #openttd
03:21-!-nielsm is "Niels Martin Hansen" on #openttd #tycoon
03:22<andythenorth>so now we have https://github.com/andythenorth/OpenTTD/commits/nrt-block
03:23<andythenorth>and now I can PR that and figure out which commits fail style rules
03:23<andythenorth>then I probably have to learn rebase -i
03:32<andythenorth>"Silence compiler warning." looks like it needs "Codechange" prefix
03:33<peter1138>Ish.
03:33<peter1138>I think the CI only checks the last commit.
03:35<andythenorth>let's see
03:37<andythenorth>https://farm.openttd.org/jenkins/blue/organizations/jenkins/OpenTTD%2FOpenTTD/detail/PR-6809/1/pipeline
03:38<peter1138>Ah guess not :p
03:38<peter1138>Want me to sort it?
03:39<andythenorth>pls
03:39<andythenorth>I do need to learn rebase, but currently it opens nano, and I don't know how to use nano :P
03:39<andythenorth>so I'd have to fix that first :P
03:39-!-APTX| [~APTX@2001:470:24:137f:2ff:ffff:fe00:1] has quit [Ping timeout: 480 seconds]
03:41<peter1138>It tells you at the bottom of the nano window!
03:42<andythenorth>yes
03:44<peter1138>It's now rebases, so basically you need to dump what you did and do it again
03:44<andythenorth>yup
03:47-!-Progman [~progman@p548D906A.dip0.t-ipconnect.de] has joined #openttd
03:47-!-Progman is "Peter Henschel" on #openttdcoop.dev #openttdcoop #openttd
03:50<andythenorth>let's see what Jenkins does now
03:54<andythenorth>oh
03:54<andythenorth>commit check still fails, that's puzzling :(
03:54<andythenorth>https://farm.openttd.org/jenkins/blue/organizations/jenkins/OpenTTD%2FOpenTTD/detail/PR-6810/1/pipeline/
03:55<andythenorth>th
03:55<andythenorth>oh trailing whitespace
03:58<andythenorth>that will need history changed? Can't just make a commit to fix that eh? :)
04:02<LordAro>you could temporarily
04:02<LordAro>or you could fix your editor :p
04:03<peter1138>Heh
04:04<peter1138>andythenorth, pretty sure compilation at least only checks the head commit.
04:04<peter1138>So yeah, no need to change history, just fix it and push.
04:09<andythenorth>might as well try
04:09<andythenorth>LordAro: not even my editor, upstream commits eh :P
04:10<andythenorth>how can we run the linters on forks? o_O
04:10<andythenorth>tbh, spaces-not-tabs is mine :P
04:11<andythenorth>presumably proper editors switch tabs vs spaces depending on file type?
04:18-!-Gja [~Martin@93-167-84-102-static.dk.customer.tdc.net] has joined #openttd
04:18-!-Gja is "Martin" on #ceph #bcache #openttd
04:19<peter1138>No, they switch them depending on your settings.
04:19<peter1138>Decent editors don't fuck with you.
04:19<andythenorth>hmm
04:19<andythenorth>maybe I need 2 editors
04:20<andythenorth>anyway, I can't find the trailing whitespace
04:21<andythenorth>I fixed these https://github.com/OpenTTD/OpenTTD/pull/6810/commits/abbe829d6f0d06187627d06f2ce9100d6b8328d7
04:23<andythenorth>apparently there is some here https://github.com/OpenTTD/OpenTTD/pull/6810/files#diff-f84f0fb7528474d2ed5e26b546694ff9R247
04:32<nielsm>when fixing up my old commits I usually try to do it by making the changes at HEAD, creating a new commit with the (possibly multiple commits depending on how many changes), then `git rebase -i master`, move the new commits up just below the ones they're fixing, and change the operation from "pick" to "fix"
04:32<nielsm>that way I generally get to work in a "clean" state instead of in the middle of a rebase operation or similar
04:36-!-sla_ro|master [~sla.ro@78.96.209.89] has quit []
04:37<peter1138>nielsm, yeah but andythenorth is a git newbie ;)
04:37-!-sla_ro|master [~sla.ro@78.96.209.89] has joined #openttd
04:37-!-sla_ro|master is "slamaster" on #sla #openttd
04:38<nielsm>for this I'd suggest doing an interactive rebase and just changing everything past the first "feature" commit to operation "fix", to squash everything into one
04:40<andythenorth>when I started using git I read the 'never ever use rebase in a public repo" part of the docs
04:40<andythenorth>and stopped there
04:40<andythenorth>that was ~5 years ago :P
04:41<nielsm>if nobody pulls from your own repo it's fine!
04:41<andythenorth>I am aware :P
04:41<nielsm>and github PRs handle it well enough!
04:41<andythenorth>anyway, the first problem is the invisible whitespace
04:42<andythenorth>some character is tripping the parser, but I can't see it
04:43<nielsm>there's two blank lines that contain whitespace?
04:43<nielsm>and one comment that ends with a space before the newline
04:46<andythenorth>yeah, so the checker says :)
04:46<andythenorth>but I can't find them
04:46<andythenorth>I fixed the comment on L1149 of town_cmd.cpp
04:46<andythenorth>but the checker disagrees with my fix
04:47<nielsm>the problem is that _every_ commit needs to be perfect, not just the end result
04:47<peter1138>Not true.
04:48<andythenorth>I think the first problem is the whitespace :)
04:48<andythenorth>I have no objection to the linting
04:48<peter1138>Or at least, it shouldn't be true o_O
04:49<nielsm>https://github.com/OpenTTD/OpenTTD-git-hooks/blob/master/hooks/check-commits.sh
04:49<nielsm>clearly takes a list of all commit ids in the changeset and checks each one individually
04:49<andythenorth>well I could make a diff of peter1138's branch, fix the diff manually, and reapply it :P
04:50<andythenorth>'diff, for people who can't learn git' :P
04:53<nielsm>try `git rebase -i master`, you get a text file like this: http://0x0.st/s_X0.txt
04:53<nielsm>then change all the operations past the first to "fix": http://0x0.st/s_XG.txt
04:53<nielsm>and save and exit
04:54<nielsm>it then takes the first change and applies all the rest as patches to that, ending up with a single commit where everything is merged in
04:55<nielsm>but if you don't see all the commits in the list then it can't work, it should start with the first commit in the changeset
05:27<andythenorth>ok so 'fix' merges commits and discards the commit message?
05:28<andythenorth>merges / squashes / melds :P
05:28<nielsm>yes
05:28<michi_cc>nielsm: I think you meant 'squash'. 'fix' stops for amending.
05:28<nielsm>michi_cc other way around?
05:28<nielsm>or well both stop for amending
05:29<nielsm>fix comments out the secondary commit messages, squash leaves them uncommented
05:29<andythenorth>fix isn't a git command
05:29<andythenorth>fixup?
05:30<nielsm>it's a "command" in interactive rebase
05:30<andythenorth>Warning: the command isn't recognized in the following line:
05:30<andythenorth> - fix 9fb23498a Fix: Incorrect newlines, spacing, and missing comment
05:31<nielsm>oh right, "fixup" is the full command name...
05:31<michi_cc>The rebase command is called fixup, but and it is definitly possible to abbreviate it as f.
05:31<nielsm>yeah just "f" is fine
05:31<andythenorth>ok this is fun
05:33<andythenorth>after rebase
05:33<andythenorth>Your branch and 'petern/nrt-block' have diverged,
05:33<andythenorth>and have 4 and 5 different commits each, respectively.
05:33<andythenorth>(use "git pull" to merge the remote branch into yours)
05:33<nielsm>yeah don't try to merge :)
05:33<andythenorth>I didn't
05:33-!-sla_ro|master [~sla.ro@78.96.209.89] has quit []
05:33<andythenorth>it would just conflict :P
05:34<nielsm>it's better to just change the upstream to be the origin/master
05:34<peter1138>yeah, of course they've diverged ;p
05:34<andythenorth>the changed remote is a side issue, I also can't push to my own remote now
05:34<andythenorth>delete everything, start again? o_O
05:35-!-sla_ro|master [~sla.ro@78.96.209.89] has joined #openttd
05:35-!-sla_ro|master is "slamaster" on #sla #openttd
05:38<andythenorth>eh I'm going to want push -f
05:45<andythenorth>hmm, this is beyond me today :)
05:45<andythenorth>I have these silly merge commits https://github.com/OpenTTD/OpenTTD/compare/master...andythenorth:nrt-block
05:45<andythenorth>we don't want those, and I don't know what to do with them
05:49<peter1138>Yes, you have to push -f
05:49<peter1138>Why did you merge again?
05:49<peter1138>Stop merging!
05:49<andythenorth>I am going to read my git config
05:50<andythenorth>hmm
05:50<andythenorth>I delete my fork and start again I think
05:51<andythenorth>the history of master in my fork is a mess
05:52<peter1138>o_O
05:52<andythenorth>https://github.com/OpenTTD/OpenTTD/compare/master...andythenorth:master
05:52<peter1138>Yeah, stop merging.
05:52<peter1138>There's usually no need to ever merge.
05:53<andythenorth>fuck it, I delete
05:53<andythenorth>this makes no sense
05:53-!-Wormnest [~Wormnest@s5596abd2.adsl.online.nl] has joined #openttd
05:53-!-Wormnest is "Wormnest" on #openttd
05:53<andythenorth>comparing master in my fork with openttd master shows no changes
05:59<Eddi|zuHause>you sure you're comparing the correct branches?
06:00<andythenorth>no
06:00<andythenorth>I've deleted the fork
06:00<andythenorth>so it's now moot
06:01<andythenorth>but if all I'm doing is checkout -b of a remote branch
06:01<andythenorth>how do merges get in?
06:01<peter1138>They don't
06:02<andythenorth>right
06:02<nielsm>they shouldn't but it can happen if you pull while in the branch
06:02<andythenorth>and if I branch -D and existing branch, what happens?
06:02<andythenorth>and / an /s
06:02<peter1138>It gets deleted.
06:02<andythenorth>and if I git push --delete origin branchname
06:03<peter1138>It deletes branchname from origin
06:03<andythenorth>so i have my merge commit in my checkout of your branch
06:03<andythenorth>for [reasons]
06:04<andythenorth>trashing the fork and starting again seems easier than unpicking that crap
06:04<peter1138>Yes
06:04<andythenorth>the only downside is this wifi is 100KB/s
06:04<andythenorth>so it's taking time
06:05<andythenorth>wonder if I can run the commit linter locally
06:05<andythenorth>someone is going to bend my ear about spamming so many PRs
06:08-!-frosch123 [~frosch@00013ce7.user.oftc.net] has joined #openttd
06:08-!-frosch123 is "frosch" on #openttdcoop.devzone +#openttd.dev #openttd
06:18-!-nielsm [~nielsm@80-162-205-79-cable.dk.customer.tdc.net] has quit [Ping timeout: 480 seconds]
06:19<peter1138>Yeah, also if the you can push -f to the branch and the PR will follow it, no need to delete/recreate.
06:20<peter1138>...
06:20<peter1138>-if the
06:20<andythenorth>ok
06:22<andythenorth>what's '-t' for in 'ln'?
06:22<andythenorth>it's not in macOS ln, and google can't find it
06:30-!-LANJesus [~lj@0001a2bd.user.oftc.net] has quit [Ping timeout: 480 seconds]
06:33*andythenorth skips that
06:41-!-Gja [~Martin@93-167-84-102-static.dk.customer.tdc.net] has quit [Quit: Going offline, see ya! (www.adiirc.com)]
06:45-!-gelignite [~gelignite@55d494c5.access.ecotel.net] has joined #openttd
06:45-!-gelignite is "gelignite" on #openttd #openttdcoop.devzone
06:57<andythenorth>oh my word, it's building :o https://github.com/OpenTTD/OpenTTD/pull/6811
07:11-!-iSoSyS [~iSoSyS@2001:8a0:e96d:ca00:8637:9192:a54d:d96] has joined #openttd
07:11-!-iSoSyS is "realname" on #/r/openttd #openttd
07:13<andythenorth>all checks passed :)
07:24<Pikka>o/
07:31<andythenorth>lo bird
07:45-!-ToffeeYogurtPots [~ToffeeYog@000269bc.user.oftc.net] has joined #openttd
07:45-!-ToffeeYogurtPots is "realname" on #oftc #privacytech #privacytools.io #odamex #/r/openttd #openttd #privacybadger #https-everywhere #i2p #tor-onions #tor-project #tor #debian-offtopic #debian-hurd #debian
07:49-!-synchris [~synchris@139.138.202.72] has joined #openttd
07:49-!-synchris is "Synesios Christou" on #openttd
07:50-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
07:50-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
07:58<andythenorth>bbl
07:58-!-andythenorth [~andytheno@217.33.116.190] has quit [Quit: andythenorth]
08:43-!-Pikka [~Albert@203-219-120-103.tpgi.com.au] has quit [Read error: Connection reset by peer]
08:51-!-gelignite [~gelignite@55d494c5.access.ecotel.net] has quit [Quit: Match found!]
08:53-!-supermop [~supermop@pool-71-105-33-106.nycmny.fios.verizon.net] has joined #openttd
08:53-!-supermop is "A CIRC user" on #openttd
08:56-!-Wacko1976_ [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
08:56-!-Wacko1976_ is "The Chat Cool People Use" on #openttd #/r/openttd
08:59-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
09:00-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
09:00-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
09:04-!-Wacko1976_ [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
09:12-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
09:18-!-Rubidium [~Rubidium@000128fa.user.oftc.net] has quit [Ping timeout: 480 seconds]
09:23-!-iSoSyS [~iSoSyS@2001:8a0:e96d:ca00:8637:9192:a54d:d96] has quit [Remote host closed the connection]
09:39-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
09:39-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
09:50-!-synchris [~synchris@139.138.202.72] has quit [Remote host closed the connection]
09:53-!-synchris [~synchris@139.138.202.72] has joined #openttd
09:53-!-synchris is "Synesios Christou" on #openttd
10:03-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
10:37-!-Alberth [~alberth@00015f9e.user.oftc.net] has joined #openttd
10:37-!-mode/#openttd [+o Alberth] by ChanServ
10:37-!-Alberth is "purple" on @#openttd
10:51<peter1138>Millenium Falcon in the Lego shop... £610 ;(
11:04<peter1138>Oh, £650
11:10-!-tokai [~tokai@00012860.user.oftc.net] has joined #openttd
11:10-!-mode/#openttd [+v tokai] by ChanServ
11:10-!-tokai is "Christian Rosentreter" on +#openttd
11:17-!-tokai|noir [~tokai@00012860.user.oftc.net] has quit [Ping timeout: 480 seconds]
11:54-!-Gja [~Martin@93-167-84-102-static.dk.customer.tdc.net] has joined #openttd
11:54-!-Gja is "Martin" on #ceph #bcache #openttd
12:03-!-Flygon [~Flygon@210-84-48-231.dyn.iinet.net.au] has quit [Read error: Connection reset by peer]
12:07-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
12:07-!-Wacko1976 is "The Chat Cool People Use" on #openttd #/r/openttd
12:14-!-supermop [~supermop@pool-71-105-33-106.nycmny.fios.verizon.net] has quit [Ping timeout: 480 seconds]
12:43-!-nielsm [~nielsm@80-162-205-79-cable.dk.customer.tdc.net] has joined #openttd
12:43-!-nielsm is "Niels Martin Hansen" on #openttd #tycoon
12:44-!-kais58 [~kais58@88.98.253.34] has quit [Ping timeout: 480 seconds]
12:52-!-andythenorth [~andytheno@217.33.116.190] has joined #openttd
12:52-!-andythenorth is "andythenorth" on #openttd
12:53<andythenorth>o/
12:56<FLHerne>andythenorth: `-t, --target-directory=DIRECTORY : specify the DIRECTORY in which to create the links`
12:56<andythenorth>thanks :)
12:57<andythenorth>I found a linux man page
12:59<FLHerne>Roadtypes!
12:59<andythenorth>https://github.com/OpenTTD/OpenTTD/blame/master/CONTRIBUTING.md#L110
12:59<FLHerne>Finally those HEQS crawlers can look non-ridiculous :P
12:59<andythenorth>^^ needs edited for macOS
12:59<andythenorth>but I'm not sure what to change it to
12:59<andythenorth>I manually made a symlink for each of the hook files
12:59<andythenorth>but either it doesn't work or I don't know how to test it, or both :P
13:00<FLHerne>Afaict, `-t .` is a NOP
13:01<FLHerne>...which of course hits Chesterton's fence, given that someone wrote it...
13:03<andythenorth>CF is nice, wasn't aware of that formally
13:03-!-Rubidium [~Rubidium@000128fa.user.oftc.net] has joined #openttd
13:03-!-mode/#openttd [+o Rubidium] by ChanServ
13:03-!-Rubidium is "Remko Bijker" on #openttdcoop.devzone @#openttd.notice @#openttd +#openttd.dev
13:05<Eddi|zuHause>i see 3 reasons why such a construct would exist: 1) it could be safeguarding against some corner cases, e.g -t options falling through from other places, 2) it could be a remnant of something more complex that was removed, but the person making that change didn't have the confidence to remove it entriely, or 3) it's a stub for something that was intended to be more flexible in the future, but was never followed through
13:10<andythenorth>I thought it just caused the contents of the dir to be aliased?
13:10<andythenorth>rather than the dir itself
13:11<andythenorth>tbh I didn't read the man page far, just enough to be sure it's not in OS X
13:12<andythenorth>but as FLHerne said, isn't "-t ." a NOP?
13:14<FLHerne>andythenorth: The /* at the end is what's doing that, no?
13:14<andythenorth>plausible
13:15<FLHerne>`-t foo` is equivalent to `ln <args> foo`
13:15<andythenorth>ok
13:15<FLHerne>(or `pushd foo && ln <args> && popd`)
13:15<andythenorth>my goal here btw is to be able to run the commit checks locally
13:16<andythenorth>having PRs fail 1st run due to whitespace and tabs is clown shoes
13:16<andythenorth>if we have a linter, I want to be able to run it :)
13:16<FLHerne>As-is, it's not doing anything
13:16<FLHerne>git-blame says you wrote this, anyway :P
13:16<andythenorth>well, being strict, it's failing on OS X
13:16<FLHerne>Ok, it's not doing anything desirable...
13:17<andythenorth>and instructions that don't work are always a bad smell :)
13:17<LordAro>andythenorth: https://github.com/OpenTTD/OpenTTD-git-hooks copy the hooks directory into .git
13:17<andythenorth>I ln-ed it
13:17<andythenorth>(the contents)
13:17<LordAro>even better :)
13:17<michi_cc>Make sure the files have +x set.
13:17<andythenorth>can't get the scripts to do anything useful
13:17-!-RedJimi [~oftc-webi@dsl-trebng11-54f900-129.dhcp.inet.fi] has quit [Remote host closed the connection]
13:17<andythenorth>when I run them, they tell me not to
13:18<FLHerne>andythenorth: I did look at the Bootstrap thing it's copied from, but that doesn't mention ln at all
13:18<LordAro>andythenorth: sounds like they're probably not executable then
13:18<LordAro>although git usually handles that...
13:22<andythenorth>FLHerne: they're definitely from OpenTTD, they're specific paths to the commit hooks
13:23<andythenorth>LordAro: no the scripts have printed output telling me not to run them
13:23<LordAro>interesting
13:23<andythenorth>it's in the src
13:25<andythenorth>https://github.com/OpenTTD/OpenTTD-git-hooks
13:26<FLHerne>andythenorth: Oh, I found where you copied it from
13:27<andythenorth>it's cargo culted :)
13:27<FLHerne>Apparently frosch123 wrote that...
13:27<andythenorth>yes
13:27<FLHerne>(I wonder where he found it :P)
13:28<frosch123>FLHerne: it is not a nop
13:28<frosch123>by default ln takes two parameters, source and target
13:29<frosch123>with -t you can link multiple at once
13:29<andythenorth>because it targets a dir, not a filename?
13:30<frosch123>"ln bla/*.txt" results in brokenness. "ln -t . bla/*.txt" links all matches to the current directory
13:30<FLHerne>frosch123: Agh, I failed to spot the ramifications of the /*
13:30<FLHerne>I even commented on it...
13:30<frosch123>you can probably do "for f in bla/*.txt; do ln %f; done"
13:31<FLHerne>So I guess the POSIXey equivalent is just `ln path/* .` ?
13:31<FLHerne>Er, -s of course
13:33<Eddi|zuHause>so, it was pretty much my option 1)
13:34<andythenorth>frosch123: so, ln faff aside, how do I run the commit hook linter(s)? o_O
13:35<andythenorth>I don't mind reading some docs btw, but eh, where to start :P
13:35<andythenorth>today was a git learning curve already
13:35<frosch123>they run on their own?
13:35<andythenorth>are they silent if they don't fail?
13:36<frosch123>yes, try a git commit "boo"
13:36<frosch123>+ "-m"
13:36<andythenorth>I'll make a junk branch
13:39-!-Wacko1976_ [~IceChat9@027-161-128-083.dynamic.caiway.nl] has joined #openttd
13:39-!-Wacko1976_ is "The Chat Cool People Use" on #openttd #/r/openttd
13:40<andythenorth>ok they're working
13:40<andythenorth>tab, trailing spaces, commit style all trigger correctly
13:41<andythenorth>thanks
13:41-!-Wacko1976 [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
13:42<andythenorth>so for CONTRIBUTING.md, shall I just add a note that if /* ln doesn't work, just do it manually?
13:42<andythenorth>or is there a more universal command?
13:42<andythenorth>o_O
13:44<Eddi|zuHause>"for i in /*; do ln <whatever> $i; done"?
13:44<andythenorth>maybe I can coerce ln to do it
13:44<andythenorth>let's try that first
13:47<frosch123>FLHerne claimed there is one
13:47*andythenorth is testing
13:50<andythenorth>I always get ln the wrong way round :P
13:50<andythenorth>but this works for me locally
13:50<andythenorth>"ln -s ../../../openttd_hooks/hooks/* ."
13:50<andythenorth>although I could do without the preceeding "cd .git/hooks"
14:01<FLHerne>andythenorth: Be warned - using `ln` with relative paths to not-the-current directory is scary
14:02<andythenorth>I'll take your word for it
14:02<FLHerne>(the paths have to be relative to the destination directory, not $PWD, which is weird)
14:02<andythenorth>'good enough'
14:02<andythenorth>:P
14:02<FLHerne>Ah, there's -r for that
14:03<FLHerne>(not sure if POSIX has it)
14:03<LordAro>it's often easier to use absolute paths to avoid having to deal with it
14:03<andythenorth>so should I PR the line above or not? o_O
14:03<andythenorth>currently the instructions won't work for at least OS X
14:03<FLHerne>Apparently not
14:03<FLHerne>And yes, I think
14:05<andythenorth>does the line work for other people? o_O
14:07<andythenorth>I'm not convinced it's correct yet tbh
14:07<andythenorth>hmm works though
14:08-!-Wacko1976_ [~IceChat9@027-161-128-083.dynamic.caiway.nl] has quit [Ping timeout: 480 seconds]
14:09<Eddi|zuHause><FLHerne> (the paths have to be relative to the destination directory, not $PWD, which is weird) <-- i always switch to the destination dir to handle that
14:10<FLHerne>Eddi|zuHause: So do I; I feared that andy was straying from the path... <andythenorth> although I could do without the preceeding "cd .git/hooks"
14:15<LordAro>pretty sure i just did `cd .git; ln -s hooks ../../hooks-repo` or similar
14:15<LordAro>worked fine
14:15<andythenorth>well I PR-ed https://github.com/OpenTTD/OpenTTD/pull/6813
14:15<andythenorth>feel free to reject it :P
14:16<andythenorth>replacing entire dirs is usually bad form, but maybe in this case it's fine
14:16<LordAro>it (probably) only has what git autogenerates for you
14:16<LordAro>so i don't really see it being an issue
14:17<Eddi|zuHause>well, it would prevent you from having custom hooks in that dir
14:17<LordAro>it would
14:17<Eddi|zuHause>but that just means you would have to put them in the hooks-repo
14:18<LordAro>yeah, you couldn't have any custom hooks prior to setting it up
14:19<Eddi|zuHause>i think that's ok for your (or lots of) special cases, but a bad thing to assume for the general case
14:20*andythenorth waits for checks to complete :)
14:21<andythenorth>building all the openttds for CONTRIBUTING.md :)
14:27-!-planetmaker_ [~planetmak@p200300D21BCAC200BB989063CBD6ECFB.dip0.t-ipconnect.de] has joined #openttd
14:27-!-planetmaker_ is "realname" on #openttd
14:27<peter1138>hi
14:28<peter1138>ooh a wild planetmaker_ appeared
14:28<andythenorth>it's a planetmaker
14:28<andythenorth>and a peter1138
14:28<andythenorth>nielsm peter1138 thanks for git help earlier btw
14:28<planetmaker_>hihi, hi :)
14:28<nielsm>yw
14:28<nielsm>rebasing takes a bit of wrapping your head around but it's an amazing tool when you master it
14:29<nielsm>for the process commonly known as "hiding the sausage making" :)
14:30-!-planetmaker is now known as Guest4545
14:30-!-planetmaker_ is now known as planetmaker
14:31<andythenorth>rebasing is banned where I work
14:31<andythenorth>except for a select few :P
14:32<planetmaker>OpenTTD still builds on a re-installed system for me. :) But has a few warnings about re-definitions of stuff etc
14:32-!-Gaby_ [~Gaby31@187.87.73.86.rev.sfr.net] has joined #openttd
14:32-!-Gaby_ is "realname" on #openttd
14:33-!-Gaby_ [~Gaby31@187.87.73.86.rev.sfr.net] has quit []
14:33<andythenorth>\o/
14:34<andythenorth>planetmaker: time to get a git checkout :)
14:34<planetmaker>I built that from the git checkout ;)
14:34<andythenorth>even better
14:34<andythenorth>you're ahead
14:34<andythenorth>I'll await your PRs :)
14:34<planetmaker>getting a git checkout is easy... working with it is a PITA :P
14:34<andythenorth>if I can learn it, anyone can :P
14:35<planetmaker>:)
14:35<andythenorth>so many PRs https://github.com/OpenTTD/OpenTTD/pulls
14:35<planetmaker>github OpenTTD still needs to learn about me / my github account, I guess. I should bother someone who can change that :)
14:36<andythenorth>where is TrueBrain anyway? :P
14:42<LordAro>omg, a pm
14:42<LordAro>planetmaker: iirc you should just need to add planetmaker@openttd.org to your GH account
14:42<LordAro>although you might need TB to give whatever account that is admin/contributor/whatever status
14:43<LordAro>oh, frosch123 or glx could do it too
14:47<planetmaker>ah, hm. Gotta check that @ LordAro
14:47<frosch123>i need a username at least
14:48-!-glx [~glx@000128ec.user.oftc.net] has joined #openttd
14:48-!-mode/#openttd [+v glx] by ChanServ
14:48-!-glx is "Loïc GUILLOUX" on +#openttd
14:48<andythenorth>planetmaker can join reviewer team :)
14:48<frosch123>planetmaker: first rule about git: always make a branch, never use master :)
14:48<andythenorth>yay
14:49<andythenorth>there is no master
14:51<peter1138>LordAro, I like my Garmin Edge 130.
14:51<planetmaker>o/
14:51<peter1138>LordAro, it's a bit spendy but, uh, I didn't tell the wife :p
14:51<planetmaker>frosch123, ok, I still need to get used to git. :)
14:52<peter1138>second rule of git, don't keep merging master. eh, andythenorth :p
14:52<LordAro>peter1138: ta
14:53<LordAro>peter1138: i'd also been looking at some of the bryton 530 stuffs
14:53<LordAro>but i know garmin has a basic monopoly on the market for one reason or another
14:53<peter1138>Fancy. Don't know anyone using Bryton.
14:53<andythenorth>peter1138: there is no master
14:53<peter1138>Indeed.
14:53<frosch123>yay, pm has a rocket-shaped avatar
14:53<andythenorth>there is only "git rebase upstream/master"
14:54<frosch123>russian-style rocket
14:54<andythenorth>as per CONTRIBUTING.md
14:54<andythenorth>can't help thinking NRT would have been easier if we'd known that :P
14:54<andythenorth>rebase, and forced pushes; we're not in Kansas any more Toto
14:55<peter1138>LordAro, looks pretty nice, that 530.
14:56<peter1138>Can get pretty good price on the Garmin 520 these days, as it's a getting a bit older.
14:56<andythenorth>do I need a new bike?
14:56<peter1138>1000/1030 are still way expensive ;(
14:56<peter1138>andythenorth, yes.
14:56<LordAro>andythenorth: always
14:56<andythenorth>well
14:56<peter1138>I just bought a new bike today.
14:56<LordAro>peter1138: couple people on my ride today had electric shifters
14:56<LordAro>they're very shiny and i want them
14:57<peter1138>For the missus though, so not that extravagant.
14:57<peter1138>Di.2 is pretty common in our group. Not used it myself.
14:57<LordAro>i think that was what they had
14:58<peter1138>Probably, it's Shimano's system.
14:58<peter1138>Nobody has campag cos it's too expensive, and SRAM is just... hmm.... hmm....
15:00-!-stefino [~oftc-webi@gw-lipa-silo-1.cust.avonet.cz] has joined #openttd
15:00-!-stefino is "OFTC WebIRC Client" on #openttd
15:02<andythenorth>so what do I want?
15:03<andythenorth>currently riding one of these http://i.ebayimg.com/00/s/NzY4WDEwMjQ=/z/tC0AAOxyLN9SeCbb/$(KGrHqZ,!qYFJ0Y9yZm1BSeCb,2zT!~~48_80.JPG
15:04<andythenorth>plus points: goes like stink, has only needed one service in 8 years
15:04<andythenorth>negative points: alumnium frame
15:04<andythenorth>also, don't love the orange
15:05<Eddi|zuHause>your URL breaks the url-parser
15:05<andythenorth>bloody ebay :)
15:09<andythenorth>weird stem on this http://www.cyclingweekly.com/reviews/hybrid-bikes/canyon-urban-review
15:09-!-KouDy [~koudy@ip4-83-240-28-102.cust.nbox.cz] has quit [Remote host closed the connection]
15:10<peter1138>Very
15:10<LordAro>much
15:11<andythenorth>I really want a hybrid, but the expensive ones come with mudguards and crap
15:11<peter1138>LordAro, I had a Garmin Edge 25 for 2 years, pretty basic but did all the tracking I ever needed. Picked it up for £50 from Aldi. Decided to upgrade as its battery life is fading.
15:11<andythenorth>what happened to On Ones?
15:11<peter1138>on one still exist
15:11-!-KouDy [~koudy@ip4-83-240-28-102.cust.nbox.cz] has joined #openttd
15:11-!-KouDy is "KouDy" on #openttd
15:12<peter1138>Well, it's still planetx
15:12<andythenorth>not just a guy in a shed any more?
15:12<andythenorth>ugh drop bars
15:12<peter1138>Anyway, why hybrid? Is what you've got a hybrid?
15:12<andythenorth>fuck knows :)
15:13<andythenorth>it's a Suburban Utility Bicycle according to Scott
15:13<peter1138>Drop bars are lovely.
15:13<FLHerne>You'd be mad not to have drop bars around here
15:13<FLHerne>(it's all flat)
15:13<andythenorth>I live in a hilly place
15:13<andythenorth>with horrible traffic
15:14<FLHerne>Anyway, the one true material for bike frames is steel, unless you look unusually good in padded lycra pants :P
15:14<peter1138>I do
15:14<andythenorth>I have a Marin Muirwoods steel hardtail, hardfork in my garage
15:15<andythenorth>it's awesome, but no disk brakes, no hub gear
15:16<FLHerne>Bought one of these a few weeks ago https://i.ebayimg.com/00/s/NjgyWDEwMjQ=/z/mRMAAOSwqu9VLAcI/$_86.JPG
15:16<FLHerne>(in somewhat better nick)
15:17<andythenorth>classic
15:17<andythenorth>that would get converted to a fixie in Bristol :P
15:17-!-stefino [~oftc-webi@gw-lipa-silo-1.cust.avonet.cz] has quit [Quit: Page closed]
15:17<FLHerne>Before that I had a slightly rusty old Raleigh
15:17<FLHerne>Ah, it had been ;-)
15:17<FLHerne>Weird
15:18<FLHerne>They'd put shiny new aero wheels, puncture-resistant tyres, mudguards...and one gear
15:18<andythenorth>bike shopping is dull
15:18<FLHerne>Mad
15:18<FLHerne>Anyway, I'm fixing that
15:18<andythenorth>'impulse buy' is the only sensible way to buy a bike :P
15:19<andythenorth>all the high end commute bikes are aluminium :x
15:19<andythenorth>and I run about 70 psi on a good day
15:19<andythenorth>ugh
15:19<FLHerne>I did get rather bored trying to find a decent 501 bike that wasn't wrecked, stolen or marked up to stupid figures as "vintage"
15:20<andythenorth>oh that 501 sticker used to be such a badge of honour :P
15:20<FLHerne>I'm tempted to get a 531, but it'll probably see too much abuse for that to be a good idea
15:21<FLHerne>Even if my backside would thank me
15:21<FLHerne>(also, they're more expensive...)
15:28-!-Zexaron [~zex-pc@cpe-86-58-122-93.static.triera.net] has joined #openttd
15:28-!-Zexaron is "AaronZek" on #openttd
15:32-!-Zexaron [~zex-pc@cpe-86-58-122-93.static.triera.net] has quit []
15:45<peter1138>hurr
15:45<peter1138>Riding a 531st light tourer as my commuting bike at the moment.
15:47<peter1138>Actually that was the bike I did 65 miles @ 18.3 mph average yesterday, while everyone else was on lightweight carbon things ;p
15:54<planetmaker>hm, even when it's a rocket, I guess, I want my "usual" icon for profile pic :)
15:54-!-chomwitt [~chomwitt@2a02:587:dc08:d500:dce0:210d:9649:b12e] has quit [Ping timeout: 480 seconds]
15:56-!-synchris [~synchris@139.138.202.72] has quit [Quit: yeeha!]
15:57-!-Alberth [~alberth@00015f9e.user.oftc.net] has left #openttd []
16:06<andythenorth>thanks michi_cc
16:17-!-chomwitt is "chomwitt" on #debian #debian-games
16:17-!-chomwitt [~chomwitt@2a02:587:dc0d:6600:dce0:210d:9649:b12e] has joined #openttd
16:25-!-sla_ro|master [~sla.ro@78.96.209.89] has quit []
16:29<peter1138>Bah, my Hyper-V graphics is much slower since this Windows update :s
16:31-!-iSoSyS [~iSoSyS@2001:8a0:e96d:ca00:8637:9192:a54d:d96] has joined #openttd
16:31-!-iSoSyS is "realname" on #/r/openttd #openttd
16:32-!-supermop_work [~supermopw@cpe-67-244-98-130.nyc.res.rr.com] has joined #openttd
16:32-!-supermop_work is "A CIRC user" on #openttd
16:41-!-gelignite [~gelignite@55d494c5.access.ecotel.net] has joined #openttd
16:41-!-gelignite is "gelignite" on #openttd #openttdcoop.devzone
16:42<andythenorth>:P
16:52<peter1138>Not even joking :(
16:52<peter1138>Maybe I should do a dual-boot again :S
16:53<peter1138>Or switch to VMware/VirtualBox/Something/
16:54<andythenorth>my experience of VirtualBox is that you get what you've paid for
16:54<andythenorth>it's great until it stops working
16:55<andythenorth>allegedly Oracle defunded it apart from 'keep the lights' on releases
16:59<planetmaker>sounds pretty much like oracle would handle anything open source :)
17:00-!-ToffeeYogurtPots [~ToffeeYog@000269bc.user.oftc.net] has quit [Remote host closed the connection]
17:03-!-iSoSyS [~iSoSyS@2001:8a0:e96d:ca00:8637:9192:a54d:d96] has quit [Ping timeout: 480 seconds]
17:07<andythenorth>wow, I'm all in favour of GDPR, but now I have to accept Ts&Cs everywhere :P
17:07<andythenorth>awesome :x
17:08-!-frosch123 [~frosch@00013ce7.user.oftc.net] has quit [Quit: be yourself, except: if you have the opportunity to be a unicorn, then be a unicorn]
17:10-!-nielsm [~nielsm@80-162-205-79-cable.dk.customer.tdc.net] has quit [Ping timeout: 480 seconds]
17:12-!-iSoSyS [~iSoSyS@dsl-74-64.bl27.telepac.pt] has joined #openttd
17:12-!-iSoSyS is "realname" on #openttd #/r/openttd
17:14<andythenorth>peter1138: so...vehicle groups? o_O
17:14*andythenorth is drawing pixels for 18 mail cars :|
17:15-!-Stimrol [~Stimrol@82.221.253.241] has quit [Ping timeout: 480 seconds]
17:32<+glx>andythenorth: and sometimes you must accept cookies to read the policy
17:33<+glx>many seem to not understant how opt-in works
17:35<andythenorth>+1
17:35-!-gelignite [~gelignite@55d494c5.access.ecotel.net] has quit [Quit: Match found!]
17:36<peter1138>Hmm, OSX is pretty slow in the CI :(
17:36<+glx>imagine when windows will be added
17:38-!-iSoSyS [~iSoSyS@dsl-74-64.bl27.telepac.pt] has quit [Remote host closed the connection]
17:42<andythenorth>OS X compile is slow
17:42<andythenorth>about 4 mins on a bad day
17:44<LordAro>glx: no reason why it'd be particularly slower, given it'll have to be on a separate host
17:44<+glx>that will add 3 targets
17:45<LordAro>3?
17:46<+glx>win32, win64 and win9x
17:46<+glx>each one giving different warnings :)
17:46<LordAro>i feel like at least one of those doesn't have to be run on every commit/PR/whatever
17:59<peter1138>So yeah, I did this thing where I... played... the game.
17:59<peter1138>Very weird.
18:02<LordAro>what
18:04-!-planetmaker [~planetmak@p200300D21BCAC200BB989063CBD6ECFB.dip0.t-ipconnect.de] has quit [Ping timeout: 480 seconds]
18:04-!-Progman [~progman@p548D906A.dip0.t-ipconnect.de] has quit [Remote host closed the connection]
18:06<andythenorth>vanilla? :o
18:06<andythenorth>no newgrf?
18:19-!-Gja [~Martin@93-167-84-102-static.dk.customer.tdc.net] has quit [Quit: Going offline, see ya! (www.adiirc.com)]
18:30<andythenorth>oops, spider solitaire :(
18:30<andythenorth>way past bedtime :P
18:30-!-andythenorth [~andytheno@217.33.116.190] has left #openttd []
19:03-!-Wormnest [~Wormnest@s5596abd2.adsl.online.nl] has quit [Quit: Leaving]
19:37-!-HerzogDeXtEr1 [~farci@dslb-188-103-137-091.188.103.pools.vodafone-ip.de] has quit [Read error: Connection reset by peer]
19:41-!-ZeNinja864 [~ZeNinja86@104.220.172.59] has joined #openttd
19:41-!-ZeNinja864 is "realname" on #openttd.dev #openttd #tycoon
19:42-!-ZeNinja864 [~ZeNinja86@104.220.172.59] has quit []
20:20-!-chomwitt [~chomwitt@2a02:587:dc0d:6600:dce0:210d:9649:b12e] has quit [Ping timeout: 480 seconds]
20:38-!-supermop [~supermop@pool-71-105-33-106.nycmny.fios.verizon.net] has joined #openttd
20:38-!-supermop is "A CIRC user" on #openttd
20:41-!-kais58 [~kais58@88.98.253.34] has joined #openttd
20:41-!-kais58 is "Callum Massey" on #openttd
21:28-!-glx [~glx@000128ec.user.oftc.net] has quit [Quit: Bye]
21:42-!-HeyCitizen_ [~HeyCitize@sttrpq3809w-lp130-03-67-68-202-204.dsl.bell.ca] has quit [Quit: ZNC 1.7.0 - https://znc.in]
21:42-!-HeyCitizen [~HeyCitize@sttrpq3809w-lp130-03-67-68-202-204.dsl.bell.ca] has joined #openttd
21:42-!-HeyCitizen is "Got ZNC?" on #openttd #/r/openttd
21:45-!-HeyCitizen_ [~HeyCitize@ip-45-41-54-196.montreal.ca.northamericancoax.com] has joined #openttd
21:45-!-HeyCitizen_ is "Got ZNC?" on #openttd #/r/openttd
21:46-!-supermop [~supermop@pool-71-105-33-106.nycmny.fios.verizon.net] has quit [Ping timeout: 480 seconds]
21:51-!-HeyCitizen [~HeyCitize@sttrpq3809w-lp130-03-67-68-202-204.dsl.bell.ca] has quit [Ping timeout: 480 seconds]
22:21-!-Flygon [~Flygon@210-84-48-231.dyn.iinet.net.au] has joined #openttd
22:21-!-Flygon is "Flygon" on #openttd
22:33-!-supermop [~supermop@pool-71-105-33-106.nycmny.fios.verizon.net] has joined #openttd
22:33-!-supermop is "A CIRC user" on #openttd
22:54-!-muffindrake2 [~muffindra@p200300864E034700268C24A9E0948012.dip0.t-ipconnect.de] has joined #openttd
22:54-!-muffindrake2 is "muffindrake" on #openttd
22:56-!-muffindrake1 [~muffindra@p200300864E2454007F3FDB33209C82A5.dip0.t-ipconnect.de] has quit [Ping timeout: 480 seconds]
---Logclosed Mon Jun 04 00:00:39 2018