Re: [PATCH] has_uncommitted_changes(): fall back to empty tree

2018-07-11 Thread Jeff King
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,

Re: [PATCH] has_uncommitted_changes(): fall back to empty tree

2018-07-11 Thread Ævar Arnfjörð Bjarmason
On Wed, Jul 11 2018, Jeff King wrote: > On Wed, Jul 11, 2018 at 09:34:02AM -0400, Jeff King wrote: > >> I do worry that other callers of run_diff_index() might have similar >> problems, though. Grepping around, the other callers seem to fall into >> one of three categories: >> >> - they