check_everything_connected: use a struct with named options

diff --git a/diffcore-break.c b/diffcore-break.c
index 44f8678d22ea466b0867591429bbcc3285cdaf91..881a74f29e4f6033a2547f2558a5ad8a3eaad584 100644 (file)
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -57,8 +57,8 @@ static int should_break(struct diff_filespec *src,
                return 1; /* even their types are different */
        }
 
-       if (src->sha1_valid && dst->sha1_valid &&
-           !hashcmp(src->sha1, dst->sha1))
+       if (src->oid_valid && dst->oid_valid &&
+           !oidcmp(&src->oid, &dst->oid))
                return 0; /* they are the same */
 
        if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0))
@@ -68,6 +68,9 @@ static int should_break(struct diff_filespec *src,
        if (max_size < MINIMUM_BREAK_SIZE)
                return 0; /* we do not break too small filepair */
 
+       if (!src->size)
+               return 0; /* we do not let empty files get renamed */
+
        if (diffcore_count_changes(src, dst,
                                   &src->cnt_data, &dst->cnt_data,
                                   0,
@@ -243,6 +246,13 @@ static void merge_broken(struct diff_filepair *p,
 
        dp = diff_queue(outq, d->one, c->two);
        dp->score = p->score;
+       /*
+        * We will be one extra user of the same src side of the
+        * broken pair, if it was used as the rename source for other
+        * paths elsewhere.  Increment to mark that the path stays
+        * in the resulting tree.
+        */
+       d->one->rename_used++;
        diff_free_filespec_data(d->two);
        diff_free_filespec_data(c->one);
        free(d);