On Wed, Jul 11, 2018 at 04:41:02PM +0200, Ævar Arnfjörð Bjarmason wrote: > > [From upthread]: It took me a minute to reproduce this. It needs "pull > > --rebase" if you don't have that setup in your config. > > Yeah, sorry about that. I tested without --rebase while simplifying the > testcase, but forgot that I have pull.rebase=true in my ~/.gitconfig, so > of course that didn't imply --no-rebase. In the grand scheme of things, it was still a pretty good bug report. :) Having the stack trace meant that the head-scratching was "why am I not calling the problem function", rather than "why am I not reproducing", which is much easier to track down. -Peff
