00:15:10 <Cheibriados> Ratskin cloak doesn't allow training evocations 13https://crawl.develz.org/mantis/view.php?id=11172 by Lavandula
00:27:05 <Eksell> Unstable branch on CRAWL.XTAHUA.COM updated to: 0.21-a0-170-g0398fc9 (34)
00:29:54 <gammafunk> if you want to watch later it's .gfgst @duul -tv:<3
00:30:34 <gammafunk> Lasty: some good gammafunk-Lasty synergy here
00:30:46 <gammafunk> .gfgk
00:30:46 <Sequell> 645. ishanyx the Slayer (L22 MfGl of Zin), splashed by a caustic shrike's acid on Depths:2 (gammafunk_the_bubble; the_bubble_gammafunk_split) on 2017-08-06 01:58:53, with 368947 points after 42036 turns and 3:20:02.
00:30:57 <gammafunk> wow, I see how it is Lasty
01:57:06 <Gretell> Windows builds of master branch on crawl.develz.org updated to: 0.21-a0-170-g0398fc9
02:54:54 <Gretell> Monster database of master branch on crawl.develz.org updated to: 0.21-a0-170-g0398fc9
03:22:00 <Rotatell> Unstable branch on crawl.beRotato.org updated to: 0.21-a0-170-g0398fc9 (34)
03:24:43 <neizenel> when will Lasty-senpai notice you
03:34:16 <gammafunk> maybe now
03:34:28 <gammafunk> Lasty: gammafunk-Lasty synergy:
03:34:30 <gammafunk> .gfgk
03:34:31 <Sequell> 645. ishanyx the Slayer (L22 MfGl of Zin), splashed by a caustic shrike's acid on Depths:2 (gammafunk_the_bubble; the_bubble_gammafunk_split) on 2017-08-06 01:58:53, with 368947 points after 42036 turns and 3:20:02.
03:34:49 <gammafunk> a pretty funny TV too, just because I have no idea in god's name what they thought they were doing
03:38:05 <gammafunk> it's fine Lasty
03:38:16 <gammafunk> I don't....it doesn't bother me....being ignored....I'm alright
03:51:19 <neizenel> ganbatte....
04:21:42 <johnstein> if you are dith and try to cast a fire spell, is the game supposed to warn you?
04:21:56 <johnstein> testing something in wizmode. wondering if that's the reason why it's not
04:37:47 <johnstein> looks like it should be checked in religion.cc:got_hates_spell() but I don't see anything in spl-cast to check it
04:38:11 <johnstein> oh. maybe I should have kept reading:
04:38:12 <johnstein> // This needs more work: there are spells which are hated but allowed if
04:38:12 <johnstein> // they don't have a certain effect. You may use Poison Arrow on those
04:38:12 <johnstein> // immune, use Mephitic Cloud to shield yourself from other clouds, and
04:38:12 <johnstein> // thus we don't prompt for them. It would be nice to prompt for them
04:38:12 <johnstein> // during the targeting phase, perhaps.
04:43:16 <johnstein> %git c6e9da29ea
04:43:16 <Cheibriados> 07MarvinPA02 * 0.20-a0-156-gc6e9da2: Remove TSO's poison conduct 10(9 months ago, 8 files, 1+ 67-) 13https://github.com/crawl/crawl/commit/c6e9da29ea2c
04:53:44 <johnstein> all I was trying to do was fix this nice simple newbie friendly bug and now I'm tempted to expand the scope
04:53:47 <johnstein> !bug 11169
04:53:47 <Sequell> https://crawl.develz.org/mantis/view.php?id=11169
05:18:35 <Cheibriados> 03gammafunk02 07* 0.21-a0-171-g0f4a3b6: Move a vault from Depths to late Dungeon (mikee) 10(5 minutes ago, 1 file, 1+ 1-) 13https://github.com/crawl/crawl/commit/0f4a3b61c6a4
06:10:11 <Jorgrell> Unstable branch on crawl.jorgrun.rocks updated to: 0.21-a0-171-g0f4a3b6 (34)
06:21:06 <Cheibriados> New branch created: pull/586 (1 commit) 13https://github.com/crawl/crawl/pull/586
06:21:06 <Cheibriados> 03johnstein02 07https://github.com/crawl/crawl/pull/586 * 0.21-a0-171-gf00aa99: Increase priority of checking for hated spells 10(46 minutes ago, 2 files, 10+ 5-) 13https://github.com/crawl/crawl/commit/f00aa99f1285
06:22:12 <johnstein> !tell |amethyst here's my first attempt at pretending I know c++: https://github.com/crawl/crawl/pull/586  I'm not convinced I'm handling All the Situations, but feels like an incremental improvement.
06:22:13 <Sequell> johnstein: OK, I'll let |amethyst know.
13:22:40 <Henzell> Unstable branch on crawl.akrasiac.org updated to: 0.21-a0-171-g0f4a3b6 (34)
13:59:53 <johnstein> is there a convention or preference for force pushing PRs? I'm assuming it's preferable to have as few commits as needed, so making tiny tweaks ought to just force push updates.
14:00:14 <johnstein> but is there an expectation of making a note in the PR? or just assume people will figure it out?
14:35:37 <MarvinPA_> i think for PRs you can just go for it
14:35:49 -!- MarvinPA_ is now known as MarvinPA
15:07:57 -!- doy_ is now known as doy
16:00:35 <johnstein> thanks. I also didn't know if GH had a way to autosquash. seem to think I read something about that here. making me think maybe it's a good idea to just have all the commits. yea I'm overthinking this
16:20:54 <advil> for PRs just do whatever you want...there is a squash mode for merging but I'm not sure we tend to use it
16:23:44 <advil> the preference that I have inferred isn't exactly for fewer commits, it's for clean / coherent commits that chunk things in a useful way, will be readable in git log, interpretable in a few years, etc
17:27:12 <Cheibriados> Wu Jian lunge bug(?) 13https://crawl.develz.org/mantis/view.php?id=11173 by Pekkekke
17:35:33 <shmup> i tend to rebase down to one commit, but only if it makes sense (which is more often than not), re: PR's, johnstein
17:35:54 <shmup> and if it's my own feature branch, i don't care about things like force pushes (i don't do 'em often, though)
17:43:10 <johnstein> I abuse force push on my feature branches. <3 rebase
17:53:14 <|amethyst> johnstein:  btw, it doesn't matter as much with single-person branches, but --force-with-lease is safer in that it makes sure the remote hasn't changed since your last pull
17:53:14 <Sequell> |amethyst: You have 1 message. Use !messages to read it.
18:14:15 <Lantell> Unstable branch on underhound.eu updated to: 0.21-a0-171-g0f4a3b6 (34)
19:17:13 -!- Fixer_ is now known as Fixer
20:47:10 -!- Amnesiac_ is now known as Amnesiac
21:19:58 -!- Amnesiac_ is now known as Amnesiac
23:08:29 -!- amalloy_ is now known as amalloy
23:21:41 <johnstein> in advil's response to my PR, he mentions something about unbrace not catching it. is unbrace something that I'm supposed to run manually? or is that something that is caught automagically elsewhere?  (comment in spl-util.cc https://github.com/crawl/crawl/pull/586/files)
23:22:12 <gammafunk> johnstein: many of us run unbrace and checkwhite through pre-commit hooks
23:22:48 <johnstein> do have to set that up? or is it configured 'on' by default? git hooks are something I've wanted to dig into but haven't carved out time to learn
23:22:56 <gammafunk> !source pre-commit
23:23:01 <Sequell> https://github.com/crawl/crawl/blob/master/crawl-ref/docs/develop/git/pre-commit
23:23:04 <gammafunk> is what I use
23:23:17 <gammafunk> that line calling checkcommit you can probably comment out
23:23:22 <gammafunk> I'm not sure that script is needed any more
23:23:49 <johnstein> do I have to config anything for this to work?
23:23:53 <gammafunk> that needs to be executable and go in your .git/hooks dir
23:23:59 <johnstein> ah ok
23:24:04 <johnstein> neat
23:24:15 <johnstein> is there a reason it's not the default setup?
23:24:25 <gammafunk> default setup?
23:24:29 <gammafunk> what default setup
23:25:17 <gammafunk> I think it's described in docs/develop somewhere, if you mean "is it documented?"
23:25:22 <gammafunk> I think it's in one of those docs
23:25:46 <johnstein> sorry, I meant after a clone, why doesn't it auto setup the .git/hooks dir with that file? or is that because git hooks are never handled like that
23:26:26 <johnstein> I was probably erroneously thinking that a git clone could auto setup the recommended hooks, etc for a project. that might be where I'm confused.
23:26:36 <gammafunk> yeah, I'm not sure if people ever do that
23:26:41 <gammafunk> it's somewhat dangerous to do
23:26:47 <gammafunk> since you could run arbitrary scripts
23:26:54 <gammafunk> but there might be a way to do it
23:26:59 <gammafunk> but in docs/develop/git/config.txt
23:27:03 <gammafunk> are some instructions
23:27:07 <gammafunk> I'd recommend taking a look at those
23:29:30 <johnstein> oh yea, this is a pretty nice file
23:29:33 <johnstein> ty
23:40:11 <johnstein> I know I asked this before, but I forget the best answer and I can't seem to find it very quickly in the logs. I had to fix sdl2 to get compiled on msys2. I made a commit in the submodule. now in the main repo, it shows me the diff with the new SHA. what's the cleanest way to handle this?
23:40:37 <johnstein> I keep forgetting about it and I do a git commit -am "message", then I have to fix it
23:43:06 <johnstein> right now I'm just doing git add file1, file2, etc. but it feels slower than I'd like sometimes and it's only a matter of time before I do a git commit -am and then do a bunch more commits and having to do some magicks to undo it
23:43:28 <johnstein> (I think that was the last best advice, git add file1 file2...)
23:49:59 <amalloy> johnstein: i don't understgand anything about how to fix your submodule problem, but git commit -am is easy to make mistakes with. i really like git add -p to let me review what i'm adding before i add it, and then git commit
23:50:41 <johnstein> I use git add -p a lot too
23:50:50 <johnstein> I really like it
23:51:15 <johnstein> but most of the time I commit often enough that my working dir is usually OK to commit together
23:51:28 <johnstein> it's just a habit I've gotten into over the past 4-5 years or so
23:52:02 <johnstein> I'm just wondering how everyone else handled the sdl2 issue. or maybe it's just a windows thing
23:52:17 <Cheibriados> Freeze (no reponse) on autoexplore 13https://crawl.develz.org/mantis/view.php?id=11174 by kurzedmetal
23:52:42 <amalloy> submodules are just weird, i dunno. anytime i see something involving a submodule i just give up and delete the whole repo
23:52:48 <johnstein> hah
23:53:05 <johnstein> I can't do that so easily. it's like admitting defeat
23:53:37 <johnstein> I'm pretty comfy with git otherwise. submodules are just newer to me. we just added a bunch to a big project at work, so I'm wondering how long it will take before we regret it
23:55:44 -!- amalloy is now known as amalloy_
23:56:04 -!- amalloy_ is now known as amalloy
23:59:14 <Eksell> Unstable branch on CRAWL.XTAHUA.COM updated to: 0.21-a0-171-g0f4a3b6 (34)