subject:"\[PATCH v7 31\/31\] merge\-recursive\: ensure we write updates for directory\-renamed file"

Re: [PATCH v7 31/31] merge-recursive: ensure we write updates for directory-renamed file

2018-02-05 Thread Stefan Beller

On Tue, Jan 30, 2018 at 3:25 PM, Elijah Newren wrote: > When a file is present in HEAD before the merge and the other side of the > merge does not modify that file, we try to avoid re-writing the file and > making it stat-dirty. However, when a file is present in HEAD before

[PATCH v7 31/31] merge-recursive: ensure we write updates for directory-renamed file

2018-01-30 Thread Elijah Newren

When a file is present in HEAD before the merge and the other side of the merge does not modify that file, we try to avoid re-writing the file and making it stat-dirty. However, when a file is present in HEAD before the merge and was in a directory that was renamed by the other side of the merge,