git-cvsimport-script: fix branch switching

[git.git] / diffcore-rename.c

diff --git a/diffcore-rename.c b/diffcore-rename.c
index 19325f2..29609c7 100644 (file)
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -165,7 +165,7 @@ static int estimate_similarity(struct diff_filespec *src,
 
        delta = diff_delta(src->data, src->size,
                           dst->data, dst->size,
-                          &delta_size);
+                          &delta_size, ~0UL);
 
        /* A delta that has a lot of literal additions would have
         * big delta_size no matter what else it does.
@@ -249,8 +249,14 @@ void diffcore_rename(int detect_rename, int minimum_score)
                                continue; /* unmerged */
                        else
                                locate_rename_dst(p->two, 1);
-               else if (!DIFF_FILE_VALID(p->two))
-                       register_rename_src(p->one, 0);
+               else if (!DIFF_FILE_VALID(p->two)) {
+                       /* If the source is a broken "delete", and
+                        * they did not really want to get broken,
+                        * that means the source actually stays.
+                        */
+                       int stays = (p->broken_pair && !p->score);
+                       register_rename_src(p->one, stays);
+               }
                else if (detect_rename == DIFF_DETECT_COPY)
                        register_rename_src(p->one, 1);
        }