From: Elijah Newren Date: Mon, 05 Feb 2018 21:26:13 GMT Subject: Re: [PATCH v7 27/31] merge-recursive: fix overwriting dirty files involved in renames Message-ID: In-Reply-To: On Mon, Feb 5, 2018 at 12:52 PM, Stefan Beller wrote: > On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren 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 Ugh, "dirty" not "directy". I must have gotten my fingers trained to type "directory" too much. I'll fix that up. >> detection will be added in a subsequent commit. >> >> Signed-off-by: Elijah Newren > > 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! Yes, with a nitpick: the existing issue it fixes is with dirty files (by which I mean uncommitted changes to tracked files) involved in renames rather than being an issue with untracked files. I did mention this fix in my original cover letter[1], but it would have been really easy to miss because it was a really long cover letter, and the mention came at the very end. Quoting from it: """ These last three deal with untracked and dirty file overwriting headaches. The middle patch in particular, isn't just a fix for directory rename detection but fixes a bug in current versions of git in overwriting dirty files that are involved in a rename. That patch could be backported and submitted independent of this series, but the final patch depends heavily on it. """ [1] https://public-inbox.org/git/20171110190550.27059-1-newren@gmail.com/