git-pack-objects: do the delta search in reverse size order

diff --git a/diffcore-rename.c b/diffcore-rename.c
index eac782bbd01b6f1145394dc778e50b50e290de48..29609c74b6f312b59b7dde798ca5fc517c4a8bbb 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.
@@ -229,24 +229,6 @@ static int score_compare(const void *a_, const void *b_)
        return b->score - a->score;
 }
 
-int diff_scoreopt_parse(const char *opt)
-{
-       int diglen, num, scale, i;
-       if (opt[0] != '-' || (opt[1] != 'M' && opt[1] != 'C' && opt[1] != 'B'))
-               return -1; /* that is not a -M, -C nor -B option */
-       diglen = strspn(opt+2, "0123456789");
-       if (diglen == 0 || strlen(opt+2) != diglen)
-               return 0; /* use default */
-       sscanf(opt+2, "%d", &num);
-       for (i = 0, scale = 1; i < diglen; i++)
-               scale *= 10;
-
-       /* user says num divided by scale and we say internally that
-        * is MAX_SCORE * num / scale.
-        */
-       return MAX_SCORE * num / scale;
-}
-
 void diffcore_rename(int detect_rename, int minimum_score)
 {
        struct diff_queue_struct *q = &diff_queued_diff;
@@ -267,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);
        }