Re: [PATCH] unpack-trees: fix oneway_merge accidentally carry over stage index

From: Junio C Hamano <gitster@pobox.com>
Date: Mar 18, 2019, 09:40 UTC
Message-ID: <xmqqh8c0zfj2.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CACsJy8CdS1oHt__SzgOxnoD=0h=iN51SWm3YjkOwYGkbzb4o9A@mail.gmail.com>

Duy Nguyen <pclouds@gmail.com> writes:

Show 14 quoted lines

>> > +     test_cmp_rev :1:a $A_OBJ &&
>> > +     test_cmp_rev :2:a $B_OBJ &&
>> > +     test_cmp_rev :3:a $C_OBJ &&
>> > +     git checkout -f topic &&
>> > +     test_cmp_rev :a $A_OBJ
>>
>> So in short, "checkout -f" should have given us an entry for path
>> "a", taken from the tip of the 'topic' branch, at stage #0 while
>> switching to that branch, but it didn't?  That would be a nice
>> summary to have at the beginning of the log message before going
>> into the implementation detail of how that happens.
>
> OK. And the last line probably should be :0:a to make it clear we're
> looking for stage #0.

I would say ":a" is plenty clear that it is looking for a merged entry without getting replaced with an overly explicit ":0:a", but ":0:a" would not hurt, either.