From: Stefan Beller <sbeller@google.com>
Date: Mon, 05 Feb 2018 20:52:50 GMT
Subject: Re: [PATCH v7 27/31] merge-recursive: fix overwriting dirty files involved in renames
Message-ID: <CAGZ79kYsYkKVgF-Bwe3HNFraaYC0DWruXE92E4x8b0oJd_Bg6w@mail.gmail.com>
In-Reply-To: <20180130232533.25846-28-newren@gmail.com>

On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren <newren@gmail.com> wrote:
> This fixes an issue that existed before my directory rename detection
> patches that affects both normal renames and renames implied by
> directory rename detection.  Additional codepaths that only affect
> overwriting of directy files that are involved in directory rename
> detection will be added in a subsequent commit.
>
> Signed-off-by: Elijah Newren <newren@gmail.com>

So this fixes bugs in the current rename detection with
overwriting untracked files? Then this is an additional
selling point of this series, maybe worth covering in the
cover letter!