diffcore-rename: use is_empty_blob_oid
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Williams committed
May 30, 2017 at 10:31 UTC
02491b67f3e4218176f3e6fe25961f1a8afade50
1 file changed
+2
-2
diffcore-rename.c
+2
-2
@@ -464,7 +464,7 @@ void diffcore_rename(struct diff_options *options)
464
strcmp(options->single_follow, p->two->path))
465
continue; /* not interested */
466
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
467
- is_empty_blob_sha1(p->two->oid.hash))
467
+ is_empty_blob_oid(&p->two->oid))
468
continue;
469
else if (add_rename_dst(p->two) < 0) {
470
warning("skipping rename detection, detected"
@@ -474,7 +474,7 @@ void diffcore_rename(struct diff_options *options)
474
}
475
}
476
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
477
- is_empty_blob_sha1(p->one->oid.hash))
477
+ is_empty_blob_oid(&p->one->oid))
478
continue;
479
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
480
/*