diffcore-rename: avoid processing duplicate destinations

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 0afe903de9d300f36f12242ef89ea0d7c46aecbf..361eed9fbcaa282e4e0ac14f2ac28a0b5d8b2826 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -467,8 +467,12 @@ void diffcore_rename(struct diff_options *options)
                        else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
                                 is_empty_blob_sha1(p->two->sha1))
                                continue;
-                       else
-                               add_rename_dst(p->two);
+                       else if (add_rename_dst(p->two) < 0) {
+                               warning("skipping rename detection, detected"
+                                       " duplicate destination '%s'",
+                                       p->two->path);
+                               goto cleanup;
+                       }
                }
                else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
                         is_empty_blob_sha1(p->one->sha1))