merge-recursive: ensure we write updates for directory-renamed file

diff --git a/merge-recursive.c b/merge-recursive.c
index 4a1ecdea03cb0e3c5cf0b9a524abdff47279a239..5f42c677d52bc3ea3ac56efda0fae6cd6d2c4a63 100644 (file)
--- 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;