Re: What's cooking in git.git (Apr 2018, #03; Wed, 25)

From: Elijah Newren <newren@gmail.com>
Date: Apr 25, 2018, 16:21 UTC
Message-ID: <CABPp-BHE0H+Y1FNH2NmYjjMRfPsKjzmfVfT5XQatqyFTi8_2kw@mail.gmail.com>
In-Reply-To: <xmqqmuxr4r6n.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Wed, Apr 25, 2018 at 1:37 AM, Junio C Hamano <gitster@pobox.com> wrote:

Show 7 quoted lines

> * en/unpack-trees-split-index-fix (2018-04-24) 1 commit
>  - unpack_trees: fix breakage when o->src_index != o->dst_index
>
>  The split-index feature had a long-standing and dormant bug in
>  certain use of the in-core merge machinery, which has been fixed.
>
>  Will merge to 'next'.

This topic...

> * en/rename-directory-detection-reboot (2018-04-25) 36 commits

<snip>

Show 6 quoted lines

>
>  Reboot of an attempt to detect wholesale directory renames and use
>  it while merging.
>
>  Expecting a reroll.
>  cf. <CABPp-BHZ-agTY77iqe9BxLC2ijrcKO+UPk83Bn+0cckA3fJFYg@mail.gmail.com>

...is the fix to the issue mentioned in this email you reference. The various revisions of the en/unpack-trees-split-index-fix patches were even posted as a response to the parent of the email you reference (which I thought made sense since the parent was the report of the issue; sorry if that confused things).

Would you still like a re-roll?

If you do, the _only_ thing I'll change is a minor typo in the commit message of 948d8a6f0895 ("t6046: testcases checking whether updates can be skipped in a merge", 2018-04-19), doing a simple s/year/years/. There aren't any remaining outstanding issues with this series I know of, and I've tested everything I can think of to test.