diff options
| author |  Elijah Newren <newren@gmail.com> | 2018-02-14 10:52:06 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-02-27 14:11:58 -0800 |
| commit | c5b761fb2711542073cf1906c0e86a34616b79ae (patch) | |
| tree | f127a060756cb53996de66d88e58a8d740118bdf /t | |
| parent | merge-recursive: avoid spurious rename/rename conflict from dir renames (diff) | |
| download | tgif-c5b761fb2711542073cf1906c0e86a34616b79ae.tar.xz | |
merge-recursive: ensure we write updates for directory-renamed file
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, we have to move the file to a new location and re-write it.
Update the code that checks whether we can skip the update to also work in
the presence of directory renames.
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6043-merge-rename-directories.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh index 45f620633f..2e28f2908d 100755 --- a/t/t6043-merge-rename-directories.sh +++ b/t/t6043-merge-rename-directories.sh @@ -3884,7 +3884,7 @@ test_expect_success '12b-setup: Moving one directory hierarchy into another' ' ) ' -test_expect_failure '12b-check: Moving one directory hierarchy into another' ' +test_expect_success '12b-check: Moving one directory hierarchy into another' ' ( cd 12b && |