diff options
| author | Elijah Newren <newren@gmail.com> | 2018-02-14 18:52:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-27 22:11:58 (GMT) |
| commit | c5b761fb2711542073cf1906c0e86a34616b79ae (patch) | |
| tree | f127a060756cb53996de66d88e58a8d740118bdf | |
| parent | febb3a86098f853066c2623c2392f156710dd40f (diff) | |
| download | git-c5b761fb2711542073cf1906c0e86a34616b79ae.zip git-c5b761fb2711542073cf1906c0e86a34616b79ae.tar.gz git-c5b761fb2711542073cf1906c0e86a34616b79ae.tar.bz2 | |
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>
| -rw-r--r-- | merge-recursive.c | 4 | ||||
| -rwxr-xr-x | t/t6043-merge-rename-directories.sh | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 4a1ecde..5f42c67 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2763,7 +2763,6 @@ static int merge_content(struct merge_options *o, if (mfi.clean && !df_conflict_remains && oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) { - int path_renamed_outside_HEAD; output(o, 3, _("Skipped %s (merged same as existing)"), path); /* * The content merge resulted in the same file contents we @@ -2771,8 +2770,7 @@ static int merge_content(struct merge_options *o, * are recorded at the correct path (which may not be true * if the merge involves a rename). */ - path_renamed_outside_HEAD = !path2 || !strcmp(path, path2); - if (!path_renamed_outside_HEAD) { + if (was_tracked(path)) { add_cacheinfo(o, mfi.mode, &mfi.oid, path, 0, (!o->call_depth), 0); return mfi.clean; diff --git a/t/t6043-merge-rename-directories.sh b/t/t6043-merge-rename-directories.sh index 45f6206..2e28f29 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 && |