Re: [PATCH v7 28/31] merge-recursive: fix remaining directory rename + dirty overwrite cases

2018-02-05 Thread Elijah Newren
On Mon, Feb 5, 2018 at 1:52 PM, Stefan Beller wrote: > On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: >> + /* >> +* Stupid double negatives in remove_file; it somehow manages >> +* to repeatedly mess me

Re: [PATCH v7 28/31] merge-recursive: fix remaining directory rename + dirty overwrite cases

2018-02-05 Thread Stefan Beller
On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > Signed-off-by: Elijah Newren > --- > merge-recursive.c | 26 +++--- > t/t6043-merge-rename-directories.sh | 8 > 2 files changed, 27 insertions(+), 7

[PATCH v7 28/31] merge-recursive: fix remaining directory rename + dirty overwrite cases

2018-01-30 Thread Elijah Newren
Signed-off-by: Elijah Newren --- merge-recursive.c | 26 +++--- t/t6043-merge-rename-directories.sh | 8 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index