IRC logs for #openttd on OFTC at 2018-06-03
            
00:09:38 *** andythenorth has left #openttd
00:10:39 *** andythenorth has joined #openttd
00:11:30 <andythenorth> jenkins hates me :P https://github.com/OpenTTD/OpenTTD/pull/6807#partial-pull-merging
00:12:09 <andythenorth> nvm, bed :P
00:12:11 *** andythenorth has quit IRC
00:19:51 <Wolf01> 'night
00:19:54 *** Wolf01 has quit IRC
00:34:58 *** gelignite has quit IRC
00:38:00 *** supermop has quit IRC
00:40:58 <peter1138> why did you merge like that?
00:41:02 <peter1138> oh he left
00:45:01 *** nielsm has quit IRC
00:48:36 *** frosch123 has quit IRC
00:52:11 *** supermop has joined #openttd
00:58:37 *** Wormnest has quit IRC
01:16:49 *** synchris has quit IRC
02:07:55 *** supermop has quit IRC
02:41:02 *** chomwitt has quit IRC
02:59:15 *** Progman has quit IRC
03:09:17 *** Supercheese has quit IRC
03:09:33 *** Supercheese has joined #openttd
03:42:49 *** Flygon has joined #openttd
04:07:46 *** techmagus has quit IRC
04:17:36 *** supermop has joined #openttd
04:20:06 *** techmagus has joined #openttd
04:23:05 *** Pikka has joined #openttd
04:40:21 *** jinks has quit IRC
04:48:41 *** jinks has joined #openttd
04:55:43 *** muffindrake1 has joined #openttd
04:57:34 *** muffindrake has quit IRC
05:08:42 *** jinks has quit IRC
05:13:43 *** glx has quit IRC
05:13:53 *** jinks has joined #openttd
05:20:41 *** HerzogDeXtEr1 has joined #openttd
05:21:55 *** jinks has quit IRC
05:25:58 *** HerzogDeXtEr has quit IRC
05:34:00 *** supermop_ has joined #openttd
05:40:05 *** supermop has quit IRC
06:01:44 *** snail_UES_ has quit IRC
06:29:06 *** supermop_ has quit IRC
07:07:28 *** techmagus has quit IRC
07:29:17 *** techmagus has joined #openttd
07:33:35 *** chomwitt has joined #openttd
07:39:25 *** Supercheese has quit IRC
07:39:42 *** Supercheese has joined #openttd
07:44:16 *** HeyCitizen_ has joined #openttd
07:46:39 *** HeyCitizen has quit IRC
08:32:03 *** andythenorth has joined #openttd
08:35:09 *** Supercheese has quit IRC
08:47:32 <andythenorth> moin
08:59:10 *** sla_ro|master has joined #openttd
09:14:31 <peter1138> hi
09:14:52 <peter1138> have you figured out git yet? :p
09:15:14 <andythenorth> reading the docs
09:15:17 <andythenorth> also trying stuff :P
09:15:34 <andythenorth> not sure what the goal is, think I want your branch in my repo
09:15:42 <andythenorth> can't just PR your branch, because then I can't make fixes
09:15:58 <andythenorth> I now have https://github.com/andythenorth/OpenTTD/commits/nrt-block
09:16:12 <andythenorth> I merged master in, which might be unwanted, but eh
09:17:03 <andythenorth> I'm making a PR to see what it looks like :P
09:17:07 <peter1138> Yes, it's unwanted. That's what messed up the original nrt!
09:17:39 <peter1138> You literally just checkout the branch. And then that's it. You have it.
09:17:58 <andythenorth> well...then you have to give me commit rights on your repo
09:18:04 <andythenorth> which isn't good
09:18:05 <peter1138> No I don't.
09:18:40 <andythenorth> ok I go round again, until it works
09:18:49 <peter1138> git checkout -b nrt-block petern/nrt-block
09:18:56 <peter1138> git push andythenorth/nrt-block
09:19:18 <andythenorth> yes
09:19:24 <peter1138> (remove local nrt-block and andythenorth:nrt-block first, cos it's already messed up)
09:19:25 <andythenorth> so far so good
09:19:31 <peter1138> git push andythenort nrt-block, sorry
09:19:45 <peter1138> +h
09:20:22 <andythenorth> ok, so why doesn't that immediately get failed as 'behind master'?
09:20:55 <peter1138> why would it?
09:21:07 <peter1138> it's not an offence to be behind master.
09:21:45 <andythenorth> ok
09:21:49 *** nielsm has joined #openttd
09:22:30 <andythenorth> so now we have https://github.com/andythenorth/OpenTTD/commits/nrt-block
09:23:31 <andythenorth> and now I can PR that and figure out which commits fail style rules
09:23:40 <andythenorth> then I probably have to learn rebase -i
09:32:53 <andythenorth> "Silence compiler warning." looks like it needs "Codechange" prefix
09:33:03 <peter1138> Ish.
09:33:15 <peter1138> I think the CI only checks the last commit.
09:35:33 <andythenorth> let's see
09:37:21 <andythenorth> https://farm.openttd.org/jenkins/blue/organizations/jenkins/OpenTTD%2FOpenTTD/detail/PR-6809/1/pipeline
09:38:03 <peter1138> Ah guess not :p
09:38:31 <peter1138> Want me to sort it?
09:39:01 <andythenorth> pls
09:39:37 <andythenorth> I do need to learn rebase, but currently it opens nano, and I don't know how to use nano :P
09:39:41 <andythenorth> so I'd have to fix that first :P
09:39:59 *** APTX| has quit IRC
09:41:08 <peter1138> It tells you at the bottom of the nano window!
09:42:01 <andythenorth> yes
09:44:01 <peter1138> It's now rebases, so basically you need to dump what you did and do it again
09:44:42 <andythenorth> yup
09:46:59 *** Progman has joined #openttd
09:50:15 <andythenorth> let's see what Jenkins does now
09:54:34 <andythenorth> oh
09:54:43 <andythenorth> commit check still fails, that's puzzling :(
09:54:46 <andythenorth> https://farm.openttd.org/jenkins/blue/organizations/jenkins/OpenTTD%2FOpenTTD/detail/PR-6810/1/pipeline/
09:55:40 <andythenorth> th
09:55:47 <andythenorth> oh trailing whitespace
09:58:56 <andythenorth> that will need history changed? Can't just make a commit to fix that eh? :)
10:02:49 <LordAro> you could temporarily
10:02:56 <LordAro> or you could fix your editor :p
10:03:49 <peter1138> Heh
10:04:10 <peter1138> andythenorth, pretty sure compilation at least only checks the head commit.
10:04:42 <peter1138> So yeah, no need to change history, just fix it and push.
10:09:36 <andythenorth> might as well try
10:09:48 <andythenorth> LordAro: not even my editor, upstream commits eh :P
10:10:01 <andythenorth> how can we run the linters on forks? o_O
10:10:22 <andythenorth> tbh, spaces-not-tabs is mine :P
10:11:51 <andythenorth> presumably proper editors switch tabs vs spaces depending on file type?
10:18:01 *** Gja has joined #openttd
10:19:04 <peter1138> No, they switch them depending on your settings.
10:19:18 <peter1138> Decent editors don't fuck with you.
10:19:34 <andythenorth> hmm
10:19:39 <andythenorth> maybe I need 2 editors
10:20:53 <andythenorth> anyway, I can't find the trailing whitespace
10:21:07 <andythenorth> I fixed these https://github.com/OpenTTD/OpenTTD/pull/6810/commits/abbe829d6f0d06187627d06f2ce9100d6b8328d7
10:23:07 <andythenorth> apparently there is some here https://github.com/OpenTTD/OpenTTD/pull/6810/files#diff-f84f0fb7528474d2ed5e26b546694ff9R247
10:32:07 <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"
10:32:39 <nielsm> that way I generally get to work in a "clean" state instead of in the middle of a rebase operation or similar
10:36:53 *** sla_ro|master has quit IRC
10:37:05 <peter1138> nielsm, yeah but andythenorth is a git newbie ;)
10:37:12 *** sla_ro|master has joined #openttd
10:38:06 <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
10:40:34 <andythenorth> when I started using git I read the 'never ever use rebase in a public repo" part of the docs
10:40:36 <andythenorth> and stopped there
10:40:48 <andythenorth> that was ~5 years ago :P
10:41:00 <nielsm> if nobody pulls from your own repo it's fine!
10:41:11 <andythenorth> I am aware :P
10:41:48 <nielsm> and github PRs handle it well enough!
10:41:55 <andythenorth> anyway, the first problem is the invisible whitespace
10:42:16 <andythenorth> some character is tripping the parser, but I can't see it
10:43:20 <nielsm> there's two blank lines that contain whitespace?
10:43:34 <nielsm> and one comment that ends with a space before the newline
10:46:09 <andythenorth> yeah, so the checker says :)
10:46:14 <andythenorth> but I can't find them
10:46:47 <andythenorth> I fixed the comment on L1149 of town_cmd.cpp
10:46:54 <andythenorth> but the checker disagrees with my fix
10:47:23 <nielsm> the problem is that _every_ commit needs to be perfect, not just the end result
10:47:43 <peter1138> Not true.
10:48:04 <andythenorth> I think the first problem is the whitespace :)
10:48:23 <andythenorth> I have no objection to the linting
10:48:25 <peter1138> Or at least, it shouldn't be true o_O
10:49:33 <nielsm> https://github.com/OpenTTD/OpenTTD-git-hooks/blob/master/hooks/check-commits.sh
10:49:46 <nielsm> clearly takes a list of all commit ids in the changeset and checks each one individually
10:49:51 <andythenorth> well I could make a diff of peter1138's branch, fix the diff manually, and reapply it :P
10:50:13 <andythenorth> 'diff, for people who can't learn git' :P
10:53:00 <nielsm> try `git rebase -i master`, you get a text file like this: http://0x0.st/s_X0.txt
10:53:38 <nielsm> then change all the operations past the first to "fix": http://0x0.st/s_XG.txt
10:53:49 <nielsm> and save and exit
10:54:09 <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
10:55:49 <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
11:27:36 <andythenorth> ok so 'fix' merges commits and discards the commit message?
11:28:10 <andythenorth> merges / squashes / melds :P
11:28:17 <nielsm> yes
11:28:23 <michi_cc> nielsm: I think you meant 'squash'. 'fix' stops for amending.
11:28:35 <nielsm> michi_cc other way around?
11:28:47 <nielsm> or well both stop for amending
11:29:06 <nielsm> fix comments out the secondary commit messages, squash leaves them uncommented
11:29:53 <andythenorth> fix isn't a git command
11:29:54 <andythenorth> fixup?
11:30:11 <nielsm> it's a "command" in interactive rebase
11:30:32 <andythenorth> Warning: the command isn't recognized in the following line:
11:30:33 <andythenorth> - fix 9fb23498a Fix: Incorrect newlines, spacing, and missing comment
11:31:20 <nielsm> oh right, "fixup" is the full command name...
11:31:23 <michi_cc> The rebase command is called fixup, but and it is definitly possible to abbreviate it as f.
11:31:34 <nielsm> yeah just "f" is fine
11:31:49 <andythenorth> ok this is fun
11:33:14 <andythenorth> after rebase
11:33:15 <andythenorth> Your branch and 'petern/nrt-block' have diverged,
11:33:16 <andythenorth> and have 4 and 5 different commits each, respectively.
11:33:25 <andythenorth> (use "git pull" to merge the remote branch into yours)
11:33:33 <nielsm> yeah don't try to merge :)
11:33:38 <andythenorth> I didn't
11:33:54 *** sla_ro|master has quit IRC
11:33:54 <andythenorth> it would just conflict :P
11:34:07 <nielsm> it's better to just change the upstream to be the origin/master
11:34:18 <peter1138> yeah, of course they've diverged ;p
11:34:36 <andythenorth> the changed remote is a side issue, I also can't push to my own remote now
11:34:45 <andythenorth> delete everything, start again? o_O
11:35:14 *** sla_ro|master has joined #openttd
11:38:23 <andythenorth> eh I'm going to want push -f
11:45:35 <andythenorth> hmm, this is beyond me today :)
11:45:42 <andythenorth> I have these silly merge commits https://github.com/OpenTTD/OpenTTD/compare/master...andythenorth:nrt-block
11:45:52 <andythenorth> we don't want those, and I don't know what to do with them
11:49:02 <peter1138> Yes, you have to push -f
11:49:13 <peter1138> Why did you merge again?
11:49:22 <peter1138> Stop merging!
11:49:30 <andythenorth> I am going to read my git config
11:50:05 <andythenorth> hmm
11:50:16 <andythenorth> I delete my fork and start again I think
11:51:39 <andythenorth> the history of master in my fork is a mess
11:52:12 <peter1138> o_O
11:52:18 <andythenorth> https://github.com/OpenTTD/OpenTTD/compare/master...andythenorth:master
11:52:19 <peter1138> Yeah, stop merging.
11:52:28 <peter1138> There's usually no need to ever merge.
11:53:18 <andythenorth> fuck it, I delete
11:53:21 <andythenorth> this makes no sense
11:53:30 *** Wormnest has joined #openttd
11:53:51 <andythenorth> comparing master in my fork with openttd master shows no changes
11:59:46 <Eddi|zuHause> you sure you're comparing the correct branches?
12:00:25 <andythenorth> no
12:00:33 <andythenorth> I've deleted the fork
12:00:36 <andythenorth> so it's now moot
12:01:32 <andythenorth> but if all I'm doing is checkout -b of a remote branch
12:01:36 <andythenorth> how do merges get in?
12:01:59 <peter1138> They don't
12:02:13 <andythenorth> right
12:02:13 <nielsm> they shouldn't but it can happen if you pull while in the branch
12:02:28 <andythenorth> and if I branch -D and existing branch, what happens?
12:02:32 <andythenorth> and / an /s
12:02:43 <peter1138> It gets deleted.
12:02:55 <andythenorth> and if I git push --delete origin branchname
12:03:33 <peter1138> It deletes branchname from origin
12:03:48 <andythenorth> so i have my merge commit in my checkout of your branch
12:03:50 <andythenorth> for [reasons]
12:04:02 <andythenorth> trashing the fork and starting again seems easier than unpicking that crap
12:04:08 <peter1138> Yes
12:04:42 <andythenorth> the only downside is this wifi is 100KB/s
12:04:50 <andythenorth> so it's taking time
12:05:22 <andythenorth> wonder if I can run the commit linter locally
12:05:42 <andythenorth> someone is going to bend my ear about spamming so many PRs
12:08:05 *** frosch123 has joined #openttd
12:18:08 *** nielsm has quit IRC
12:19:56 <peter1138> Yeah, also if the you can push -f to the branch and the PR will follow it, no need to delete/recreate.
12:20:00 <peter1138> ...
12:20:03 <peter1138> -if the
12:20:17 <andythenorth> ok
12:22:40 <andythenorth> what's '-t' for in 'ln'?
12:22:47 <andythenorth> it's not in macOS ln, and google can't find it
12:30:31 *** LANJesus has quit IRC
12:33:01 * andythenorth skips that
12:41:12 *** Gja has quit IRC
12:45:41 *** gelignite has joined #openttd
12:57:23 <andythenorth> oh my word, it's building :o https://github.com/OpenTTD/OpenTTD/pull/6811
13:11:59 *** iSoSyS has joined #openttd
13:13:54 <andythenorth> all checks passed :)
13:24:22 <Pikka> o/
13:31:39 <andythenorth> lo bird
13:45:05 *** ToffeeYogurtPots has joined #openttd
13:49:02 *** synchris has joined #openttd
13:50:05 *** Wacko1976 has joined #openttd
13:58:57 <andythenorth> bbl
13:58:59 *** andythenorth has quit IRC
14:43:16 *** Pikka has quit IRC
14:51:39 *** gelignite has quit IRC
14:53:25 *** supermop has joined #openttd
14:56:27 *** Wacko1976_ has joined #openttd
14:59:22 *** Wacko1976 has quit IRC
15:00:44 *** Wacko1976 has joined #openttd
15:04:28 *** Wacko1976_ has quit IRC
15:12:52 *** Wacko1976 has quit IRC
15:18:27 *** Rubidium has quit IRC
15:23:10 *** iSoSyS has quit IRC
15:39:03 *** Wacko1976 has joined #openttd
15:50:28 *** synchris has quit IRC
15:53:53 *** synchris has joined #openttd
16:03:27 *** Wacko1976 has quit IRC
16:37:14 *** Alberth has joined #openttd
16:37:14 *** ChanServ sets mode: +o Alberth
16:51:49 <peter1138> Millenium Falcon in the Lego shop... £610 ;(
17:04:06 <peter1138> Oh, £650
17:10:35 *** tokai has joined #openttd
17:10:35 *** ChanServ sets mode: +v tokai
17:17:33 *** tokai|noir has quit IRC
17:54:48 *** Gja has joined #openttd
18:03:33 *** Flygon has quit IRC
18:07:56 *** Wacko1976 has joined #openttd
18:14:30 *** supermop has quit IRC
18:43:41 *** nielsm has joined #openttd
18:44:28 *** kais58 has quit IRC
18:52:26 *** andythenorth has joined #openttd
18:53:04 <andythenorth> o/
18:56:42 <FLHerne> andythenorth: `-t, --target-directory=DIRECTORY : specify the DIRECTORY in which to create the links`
18:56:58 <andythenorth> thanks :)
18:57:02 <andythenorth> I found a linux man page
18:58:59 <FLHerne> Roadtypes!
18:59:08 <andythenorth> https://github.com/OpenTTD/OpenTTD/blame/master/CONTRIBUTING.md#L110
18:59:15 <FLHerne> Finally those HEQS crawlers can look non-ridiculous :P
18:59:22 <andythenorth> ^^ needs edited for macOS
18:59:30 <andythenorth> but I'm not sure what to change it to
18:59:42 <andythenorth> I manually made a symlink for each of the hook files
18:59:58 <andythenorth> but either it doesn't work or I don't know how to test it, or both :P
19:00:50 <FLHerne> Afaict, `-t .` is a NOP
19:01:52 <FLHerne> ...which of course hits Chesterton's fence, given that someone wrote it...
19:03:22 <andythenorth> CF is nice, wasn't aware of that formally
19:03:44 *** Rubidium has joined #openttd
19:03:44 *** ChanServ sets mode: +o Rubidium
19:05:18 <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
19:10:31 <andythenorth> I thought it just caused the contents of the dir to be aliased?
19:10:37 <andythenorth> rather than the dir itself
19:11:05 <andythenorth> tbh I didn't read the man page far, just enough to be sure it's not in OS X
19:12:03 <andythenorth> but as FLHerne said, isn't "-t ." a NOP?
19:14:23 <FLHerne> andythenorth: The /* at the end is what's doing that, no?
19:14:59 <andythenorth> plausible
19:15:09 <FLHerne> `-t foo` is equivalent to `ln <args> foo`
19:15:32 <andythenorth> ok
19:15:33 <FLHerne> (or `pushd foo && ln <args> && popd`)
19:15:55 <andythenorth> my goal here btw is to be able to run the commit checks locally
19:16:08 <andythenorth> having PRs fail 1st run due to whitespace and tabs is clown shoes
19:16:24 <andythenorth> if we have a linter, I want to be able to run it :)
19:16:30 <FLHerne> As-is, it's not doing anything
19:16:44 <FLHerne> git-blame says you wrote this, anyway :P
19:16:44 <andythenorth> well, being strict, it's failing on OS X
19:16:59 <FLHerne> Ok, it's not doing anything desirable...
19:17:02 <andythenorth> and instructions that don't work are always a bad smell :)
19:17:09 <LordAro> andythenorth: https://github.com/OpenTTD/OpenTTD-git-hooks copy the hooks directory into .git
19:17:19 <andythenorth> I ln-ed it
19:17:23 <andythenorth> (the contents)
19:17:29 <LordAro> even better :)
19:17:39 <michi_cc> Make sure the files have +x set.
19:17:43 <andythenorth> can't get the scripts to do anything useful
19:17:44 *** RedJimi has quit IRC
19:17:49 <andythenorth> when I run them, they tell me not to
19:18:10 <FLHerne> andythenorth: I did look at the Bootstrap thing it's copied from, but that doesn't mention ln at all
19:18:47 <LordAro> andythenorth: sounds like they're probably not executable then
19:18:53 <LordAro> although git usually handles that...
19:22:54 <andythenorth> FLHerne: they're definitely from OpenTTD, they're specific paths to the commit hooks
19:23:09 <andythenorth> LordAro: no the scripts have printed output telling me not to run them
19:23:18 <LordAro> interesting
19:23:32 <andythenorth> it's in the src
19:25:33 <andythenorth> https://github.com/OpenTTD/OpenTTD-git-hooks
19:26:39 <FLHerne> andythenorth: Oh, I found where you copied it from
19:27:27 <andythenorth> it's cargo culted :)
19:27:28 <FLHerne> Apparently frosch123 wrote that...
19:27:33 <andythenorth> yes
19:27:41 <FLHerne> (I wonder where he found it :P)
19:28:47 <frosch123> FLHerne: it is not a nop
19:28:59 <frosch123> by default ln takes two parameters, source and target
19:29:05 <frosch123> with -t you can link multiple at once
19:29:37 <andythenorth> because it targets a dir, not a filename?
19:30:25 <frosch123> "ln bla/*.txt" results in brokenness. "ln -t . bla/*.txt" links all matches to the current directory
19:30:26 <FLHerne> frosch123: Agh, I failed to spot the ramifications of the /*
19:30:31 <FLHerne> I even commented on it...
19:30:45 <frosch123> you can probably do "for f in bla/*.txt; do ln %f; done"
19:31:25 <FLHerne> So I guess the POSIXey equivalent is just `ln path/* .` ?
19:31:50 <FLHerne> Er, -s of course
19:33:45 <Eddi|zuHause> so, it was pretty much my option 1)
19:34:48 <andythenorth> frosch123: so, ln faff aside, how do I run the commit hook linter(s)? o_O
19:35:00 <andythenorth> I don't mind reading some docs btw, but eh, where to start :P
19:35:08 <andythenorth> today was a git learning curve already
19:35:24 <frosch123> they run on their own?
19:35:56 <andythenorth> are they silent if they don't fail?
19:36:10 <frosch123> yes, try a git commit "boo"
19:36:23 <frosch123> + "-m"
19:36:28 <andythenorth> I'll make a junk branch
19:39:32 *** Wacko1976_ has joined #openttd
19:40:45 <andythenorth> ok they're working
19:40:57 <andythenorth> tab, trailing spaces, commit style all trigger correctly
19:41:06 <andythenorth> thanks
19:41:42 *** Wacko1976 has quit IRC
19:42:06 <andythenorth> so for CONTRIBUTING.md, shall I just add a note that if /* ln doesn't work, just do it manually?
19:42:17 <andythenorth> or is there a more universal command?
19:42:19 <andythenorth> o_O
19:44:06 <Eddi|zuHause> "for i in /*; do ln <whatever> $i; done"?
19:44:37 <andythenorth> maybe I can coerce ln to do it
19:44:40 <andythenorth> let's try that first
19:47:07 <frosch123> FLHerne claimed there is one
19:47:53 * andythenorth is testing
19:50:13 <andythenorth> I always get ln the wrong way round :P
19:50:18 <andythenorth> but this works for me locally
19:50:19 <andythenorth> "ln -s ../../../openttd_hooks/hooks/* ."
19:50:50 <andythenorth> although I could do without the preceeding "cd .git/hooks"
20:01:50 <FLHerne> andythenorth: Be warned - using `ln` with relative paths to not-the-current directory is scary
20:02:14 <andythenorth> I'll take your word for it
20:02:28 <FLHerne> (the paths have to be relative to the destination directory, not $PWD, which is weird)
20:02:49 <andythenorth> 'good enough'
20:02:50 <andythenorth> :P
20:02:56 <FLHerne> Ah, there's -r for that
20:03:05 <FLHerne> (not sure if POSIX has it)
20:03:07 <LordAro> it's often easier to use absolute paths to avoid having to deal with it
20:03:24 <andythenorth> so should I PR the line above or not? o_O
20:03:33 <andythenorth> currently the instructions won't work for at least OS X
20:03:34 <FLHerne> Apparently not
20:03:45 <FLHerne> And yes, I think
20:05:50 <andythenorth> does the line work for other people? o_O
20:07:10 <andythenorth> I'm not convinced it's correct yet tbh
20:07:40 <andythenorth> hmm works though
20:08:02 *** Wacko1976_ has quit IRC
20:09:51 <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
20:10:28 <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"
20:15:02 <LordAro> pretty sure i just did `cd .git; ln -s hooks ../../hooks-repo` or similar
20:15:04 <LordAro> worked fine
20:15:29 <andythenorth> well I PR-ed https://github.com/OpenTTD/OpenTTD/pull/6813
20:15:36 <andythenorth> feel free to reject it :P
20:16:03 <andythenorth> replacing entire dirs is usually bad form, but maybe in this case it's fine
20:16:32 <LordAro> it (probably) only has what git autogenerates for you
20:16:42 <LordAro> so i don't really see it being an issue
20:17:21 <Eddi|zuHause> well, it would prevent you from having custom hooks in that dir
20:17:38 <LordAro> it would
20:17:53 <Eddi|zuHause> but that just means you would have to put them in the hooks-repo
20:18:28 <LordAro> yeah, you couldn't have any custom hooks prior to setting it up
20:19: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
20:20:54 * andythenorth waits for checks to complete :)
20:21:07 <andythenorth> building all the openttds for CONTRIBUTING.md :)
20:27:43 *** planetmaker_ has joined #openttd
20:27:56 <peter1138> hi
20:28:04 <peter1138> ooh a wild planetmaker_ appeared
20:28:05 <andythenorth> it's a planetmaker
20:28:10 <andythenorth> and a peter1138
20:28:23 <andythenorth> nielsm peter1138 thanks for git help earlier btw
20:28:32 <planetmaker_> hihi, hi :)
20:28:36 <nielsm> yw
20:28:54 <nielsm> rebasing takes a bit of wrapping your head around but it's an amazing tool when you master it
20:29:16 <nielsm> for the process commonly known as "hiding the sausage making" :)
20:30:31 *** planetmaker is now known as Guest4545
20:30:31 *** planetmaker_ is now known as planetmaker
20:31:31 <andythenorth> rebasing is banned where I work
20:31:35 <andythenorth> except for a select few :P
20:32:42 <planetmaker> OpenTTD still builds on a re-installed system for me. :) But has a few warnings about re-definitions of stuff etc
20:32:59 *** Gaby_ has joined #openttd
20:33:53 <andythenorth> \o/
20:34:09 <andythenorth> planetmaker: time to get a git checkout :)
20:34:19 <planetmaker> I built that from the git checkout ;)
20:34:22 <andythenorth> even better
20:34:24 <andythenorth> you're ahead
20:34:39 <andythenorth> I'll await your PRs :)
20:34:40 <planetmaker> getting a git checkout is easy... working with it is a PITA :P
20:34:54 <andythenorth> if I can learn it, anyone can :P
20:35:02 <planetmaker> :)
20:35:44 <andythenorth> so many PRs https://github.com/OpenTTD/OpenTTD/pulls
20:35:46 <planetmaker> github OpenTTD still needs to learn about me / my github account, I guess. I should bother someone who can change that :)
20:36:19 <andythenorth> where is TrueBrain anyway? :P
20:42:04 <LordAro> omg, a pm
20:42:38 <LordAro> planetmaker: iirc you should just need to add planetmaker@openttd.org to your GH account
20:42:59 <LordAro> although you might need TB to give whatever account that is admin/contributor/whatever status
20:43:35 <LordAro> oh, frosch123 or glx could do it too
20:47:03 <planetmaker> ah, hm. Gotta check that @ LordAro
20:47:28 <frosch123> i need a username at least
20:48:00 *** glx has joined #openttd
20:48:00 *** ChanServ sets mode: +v glx
20:48:38 <andythenorth> planetmaker can join reviewer team :)
20:48:39 <frosch123> planetmaker: first rule about git: always make a branch, never use master :)
20:48:44 <andythenorth> yay
20:49:01 <andythenorth> there is no master
20:51:18 <peter1138> LordAro, I like my Garmin Edge 130.
20:51:29 <planetmaker> o/
20:51:38 <peter1138> LordAro, it's a bit spendy but, uh, I didn't tell the wife :p
20:51:55 <planetmaker> frosch123, ok, I still need to get used to git. :)
20:52:27 <peter1138> second rule of git, don't keep merging master. eh, andythenorth :p
20:52:53 <LordAro> peter1138: ta
20:53:06 <LordAro> peter1138: i'd also been looking at some of the bryton 530 stuffs
20:53:23 <LordAro> but i know garmin has a basic monopoly on the market for one reason or another
20:53:28 <peter1138> Fancy. Don't know anyone using Bryton.
20:53:28 <andythenorth> peter1138: there is no master
20:53:29 <peter1138> Indeed.
20:53:56 <frosch123> yay, pm has a rocket-shaped avatar
20:53:57 <andythenorth> there is only "git rebase upstream/master"
20:54:06 <frosch123> russian-style rocket
20:54:10 <andythenorth> as per CONTRIBUTING.md
20:54:20 <andythenorth> can't help thinking NRT would have been easier if we'd known that :P
20:54:49 <andythenorth> rebase, and forced pushes; we're not in Kansas any more Toto
20:55:08 <peter1138> LordAro, looks pretty nice, that 530.
20:56:01 <peter1138> Can get pretty good price on the Garmin 520 these days, as it's a getting a bit older.
20:56:14 <andythenorth> do I need a new bike?
20:56:22 <peter1138> 1000/1030 are still way expensive ;(
20:56:24 <peter1138> andythenorth, yes.
20:56:31 <LordAro> andythenorth: always
20:56:38 <andythenorth> well
20:56:39 <peter1138> I just bought a new bike today.
20:56:43 <LordAro> peter1138: couple people on my ride today had electric shifters
20:56:47 <LordAro> they're very shiny and i want them
20:57:34 <peter1138> For the missus though, so not that extravagant.
20:57:49 <peter1138> Di.2 is pretty common in our group. Not used it myself.
20:57:59 <LordAro> i think that was what they had
20:58:19 <peter1138> Probably, it's Shimano's system.
20:58:40 <peter1138> Nobody has campag cos it's too expensive, and SRAM is just... hmm.... hmm....
21:00:02 *** stefino has joined #openttd
21:02:56 <andythenorth> so what do I want?
21:03:04 <andythenorth> currently riding one of these http://i.ebayimg.com/00/s/NzY4WDEwMjQ=/z/tC0AAOxyLN9SeCbb/$(KGrHqZ,!qYFJ0Y9yZm1BSeCb,2zT!~~48_80.JPG
21:04:11 <andythenorth> plus points: goes like stink, has only needed one service in 8 years
21:04:18 <andythenorth> negative points: alumnium frame
21:04:54 <andythenorth> also, don't love the orange
21:05:07 <Eddi|zuHause> your URL breaks the url-parser
21:05:14 <andythenorth> bloody ebay :)
21:09:53 <andythenorth> weird stem on this http://www.cyclingweekly.com/reviews/hybrid-bikes/canyon-urban-review
21:09:59 *** KouDy has quit IRC
21:10:10 <peter1138> Very
21:10:18 <LordAro> much
21:11:25 <andythenorth> I really want a hybrid, but the expensive ones come with mudguards and crap
21:11:27 <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.
21:11:30 <andythenorth> what happened to On Ones?
21:11:42 <peter1138> on one still exist
21:11:44 *** KouDy has joined #openttd
21:12:07 <peter1138> Well, it's still planetx
21:12:19 <andythenorth> not just a guy in a shed any more?
21:12:30 <andythenorth> ugh drop bars
21:12:40 <peter1138> Anyway, why hybrid? Is what you've got a hybrid?
21:12:48 <andythenorth> fuck knows :)
21:13:04 <andythenorth> it's a Suburban Utility Bicycle according to Scott
21:13:10 <peter1138> Drop bars are lovely.
21:13:19 <FLHerne> You'd be mad not to have drop bars around here
21:13:24 <FLHerne> (it's all flat)
21:13:48 <andythenorth> I live in a hilly place
21:13:53 <andythenorth> with horrible traffic
21:14:15 <FLHerne> Anyway, the one true material for bike frames is steel, unless you look unusually good in padded lycra pants :P
21:14:31 <peter1138> I do
21:14:58 <andythenorth> I have a Marin Muirwoods steel hardtail, hardfork in my garage
21:15:15 <andythenorth> it's awesome, but no disk brakes, no hub gear
21:16:53 <FLHerne> Bought one of these a few weeks ago https://i.ebayimg.com/00/s/NjgyWDEwMjQ=/z/mRMAAOSwqu9VLAcI/$_86.JPG
21:16:59 <FLHerne> (in somewhat better nick)
21:17:06 <andythenorth> classic
21:17:16 <andythenorth> that would get converted to a fixie in Bristol :P
21:17:16 *** stefino has quit IRC
21:17:22 <FLHerne> Before that I had a slightly rusty old Raleigh
21:17:31 <FLHerne> Ah, it had been ;-)
21:17:35 <FLHerne> Weird
21:18:02 <FLHerne> They'd put shiny new aero wheels, puncture-resistant tyres, mudguards...and one gear
21:18:03 <andythenorth> bike shopping is dull
21:18:04 <FLHerne> Mad
21:18:17 <FLHerne> Anyway, I'm fixing that
21:18:33 <andythenorth> 'impulse buy' is the only sensible way to buy a bike :P
21:19:27 <andythenorth> all the high end commute bikes are aluminium :x
21:19:39 <andythenorth> and I run about 70 psi on a good day
21:19:48 <andythenorth> ugh
21:19:48 <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"
21:20:15 <andythenorth> oh that 501 sticker used to be such a badge of honour :P
21:20:52 <FLHerne> I'm tempted to get a 531, but it'll probably see too much abuse for that to be a good idea
21:21:04 <FLHerne> Even if my backside would thank me
21:21:35 <FLHerne> (also, they're more expensive...)
21:28:09 *** Zexaron has joined #openttd
21:32:58 *** Zexaron has quit IRC
21:45:33 <peter1138> hurr
21:45:53 <peter1138> Riding a 531st light tourer as my commuting bike at the moment.
21:47:23 <peter1138> Actually that was the bike I did 65 miles @ 18.3 mph average yesterday, while everyone else was on lightweight carbon things ;p
21:54:55 <planetmaker> hm, even when it's a rocket, I guess, I want my "usual" icon for profile pic :)
21:54:57 *** chomwitt has quit IRC
21:56:31 *** synchris has quit IRC
21:57:30 *** Alberth has left #openttd
22:06:40 <andythenorth> thanks michi_cc
22:17:16 *** chomwitt has joined #openttd
22:25:25 *** sla_ro|master has quit IRC
22:29:21 <peter1138> Bah, my Hyper-V graphics is much slower since this Windows update :s
22:31:13 *** iSoSyS has joined #openttd
22:32:06 *** supermop_work has joined #openttd
22:41:43 *** gelignite has joined #openttd
22:42:00 <andythenorth> :P
22:52:44 <peter1138> Not even joking :(
22:52:59 <peter1138> Maybe I should do a dual-boot again :S
22:53:19 <peter1138> Or switch to VMware/VirtualBox/Something/
22:54:31 <andythenorth> my experience of VirtualBox is that you get what you've paid for
22:54:43 <andythenorth> it's great until it stops working
22:55:20 <andythenorth> allegedly Oracle defunded it apart from 'keep the lights' on releases
22:59:56 <planetmaker> sounds pretty much like oracle would handle anything open source :)
23:00:26 *** ToffeeYogurtPots has quit IRC
23:03:58 *** iSoSyS has quit IRC
23:07:32 <andythenorth> wow, I'm all in favour of GDPR, but now I have to accept Ts&Cs everywhere :P
23:07:37 <andythenorth> awesome :x
23:08:00 *** frosch123 has quit IRC
23:10:08 *** nielsm has quit IRC
23:12:09 *** iSoSyS has joined #openttd
23:14:09 <andythenorth> peter1138: so...vehicle groups? o_O
23:14:31 * andythenorth is drawing pixels for 18 mail cars :|
23:15:12 *** Stimrol has quit IRC
23:32:50 <glx> andythenorth: and sometimes you must accept cookies to read the policy
23:33:33 <glx> many seem to not understant how opt-in works
23:35:09 <andythenorth> +1
23:35:55 *** gelignite has quit IRC
23:36:14 <peter1138> Hmm, OSX is pretty slow in the CI :(
23:36:48 <glx> imagine when windows will be added
23:38:02 *** iSoSyS has quit IRC
23:42:45 <andythenorth> OS X compile is slow
23:42:50 <andythenorth> about 4 mins on a bad day
23:44:20 <LordAro> glx: no reason why it'd be particularly slower, given it'll have to be on a separate host
23:44:51 <glx> that will add 3 targets
23:45:49 <LordAro> 3?
23:46:04 <glx> win32, win64 and win9x
23:46:29 <glx> each one giving different warnings :)
23:46:50 <LordAro> i feel like at least one of those doesn't have to be run on every commit/PR/whatever
23:59:25 <peter1138> So yeah, I did this thing where I... played... the game.
23:59:29 <peter1138> Very weird.