summaryrefslogtreecommitdiff
path: root/diffcore-rename.c
diff options
context:
space:
mode:
authorBrandon Williams <bmwill@google.com>2017-05-30 10:31:08 -0700
committerJunio C Hamano <gitster@pobox.com>2017-06-05 11:23:58 +0900
commit02491b67f3e4218176f3e6fe25961f1a8afade50 (patch)
tree91cf4e11db867b9c89b3000ba8ed182bcfc6e733 /diffcore-rename.c
parent0e72462fb403110461faa1b06369b5c989ded381 (diff)
downloadgit-02491b67f3e4218176f3e6fe25961f1a8afade50.tar.gz
diffcore-rename: use is_empty_blob_oid
Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-rename.c')
-rw-r--r--diffcore-rename.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 3d9719dadc..03d1e8d40b 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -464,7 +464,7 @@ void diffcore_rename(struct diff_options *options)
strcmp(options->single_follow, p->two->path))
continue; /* not interested */
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
- is_empty_blob_sha1(p->two->oid.hash))
+ is_empty_blob_oid(&p->two->oid))
continue;
else if (add_rename_dst(p->two) < 0) {
warning("skipping rename detection, detected"
@@ -474,7 +474,7 @@ void diffcore_rename(struct diff_options *options)
}
}
else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
- is_empty_blob_sha1(p->one->oid.hash))
+ is_empty_blob_oid(&p->one->oid))
continue;
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
/*