Jeff King <peff@xxxxxxxx> writes: > On Fri, Mar 30, 2018 at 09:04:13PM +0200, Johannes Schindelin wrote: > >> > Probably the flockfile should go into do_config_from_file(), where we >> > specify to use the unlocked variants. >> >> Ah, that makes sense now! I am glad I could also help ;-) > > :) > >> > Yeah, I'll wait to see how your refactor turns out. >> >> I don't think I'll touch too much in that part of the code. My changes >> should not cause merge conflicts with a patch moving the >> flockfile()/funlockfile() calls to do_config_from_file(). > > OK, then let's do this while we're thinking about it: Yup, what Dscho found was quite amusing ;-) and this obviously makes the code clearer to follow. Will queue, thanks.