Use a hashtable for objects instead of a sorted list

[git.git] / diffcore-break.c

diff --git a/diffcore-break.c b/diffcore-break.c
index 082e4e5..c57513a 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -62,10 +62,14 @@ static int should_break(struct diff_filespec *src,
                return 0; /* error but caught downstream */
 
        base_size = ((src->size < dst->size) ? src->size : dst->size);
+       if (base_size < MINIMUM_BREAK_SIZE)
+               return 0; /* we do not break too small filepair */
 
        delta = diff_delta(src->data, src->size,
                           dst->data, dst->size,
-                          &delta_size);
+                          &delta_size, 0);
+       if (!delta)
+               return 0; /* error but caught downstream */
 
        /* Estimate the edit size by interpreting delta. */
        if (count_delta(delta, delta_size,
@@ -168,8 +172,7 @@ void diffcore_break(int break_score)
                    !S_ISDIR(p->one->mode) && !S_ISDIR(p->two->mode) &&
                    !strcmp(p->one->path, p->two->path)) {
                        if (should_break(p->one, p->two,
-                                        break_score, &score) &&
-                           MINIMUM_BREAK_SIZE <= p->one->size) {
+                                        break_score, &score)) {
                                /* Split this into delete and create */
                                struct diff_filespec *null_one, *null_two;
                                struct diff_filepair *dp;
@@ -214,7 +217,7 @@ static void merge_broken(struct diff_filepair *p,
                         struct diff_queue_struct *outq)
 {
        /* p and pp are broken pairs we want to merge */
-       struct diff_filepair *c = p, *d = pp;
+       struct diff_filepair *c = p, *d = pp, *dp;
        if (DIFF_FILE_VALID(p->one)) {
                /* this must be a delete half */
                d = p; c = pp;
@@ -229,7 +232,8 @@ static void merge_broken(struct diff_filepair *p,
        if (!DIFF_FILE_VALID(c->two))
                die("internal error in merge #4");
 
-       diff_queue(outq, d->one, c->two);
+       dp = diff_queue(outq, d->one, c->two);
+       dp->score = p->score;
        diff_free_filespec_data(d->two);
        diff_free_filespec_data(c->one);
        free(d);
@@ -251,7 +255,6 @@ void diffcore_merge_broken(void)
                        /* we already merged this with its peer */
                        continue;
                else if (p->broken_pair &&
-                        p->score == 0 &&
                         !strcmp(p->one->path, p->two->path)) {
                        /* If the peer also survived rename/copy, then
                         * we merge them back together.
@@ -259,7 +262,6 @@ void diffcore_merge_broken(void)
                        for (j = i + 1; j < q->nr; j++) {
                                struct diff_filepair *pp = q->queue[j];
                                if (pp->broken_pair &&
-                                   p->score == 0 &&
                                    !strcmp(pp->one->path, pp->two->path) &&
                                    !strcmp(p->one->path, pp->two->path)) {
                                        /* Peer survived.  Merge them */