Re: What's cooking in git.git (Apr 2018, #02; Tue, 17)

From: Junio C Hamano <gitster@pobox.com>
Date: Apr 18, 2018, 21:04 UTC
Message-ID: <xmqqzi20grab.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <CABPp-BEKe1u_e=5V471PzoJjdvuYZ2n8H=h7mVa8fOR7XsoytA@mail.gmail.com>

Elijah Newren <newren@gmail.com> writes:

Show 14 quoted lines

> On Mon, Apr 16, 2018 at 11:07 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> * en/rename-directory-detection-reboot (2018-04-16) 32 commits
>>  ...
>>  - directory rename detection: testcases to avoid taking detection too far
>>  - directory rename detection: directory splitting testcases
>>  - directory rename detection: basic testcases
>>
>>  Reboot of an attempt to detect wholesale directory renames and use
>>  it while merging.
>
>
> Thanks for rebasing/cherry-picking the series and applying my newest
> changes.  It looks like a couple of your squashed fixes in the rebase
> of the old commits ...

Thanks for rebooting the effort. The above wasn't a serious attempt to re-queue the series to be polished for 'next'---to me, this branch was primarily to keep track of your interim 29+fractional patches until "the real thing", possibly rebased to newer codebase, gets submitted.

> Also, the newest patches can still be fooled by a specially crafted
> rename/add conflict, but I believe with a small restructure I can both
> simplify the code and cover all the cases.

That's nice.  Very much looking forward to the updates.

Thanks.