From: Brandon Williams <bmwill@google.com>
Date: Tue, 30 May 2017 17:31:08 +0000 (-0700)
Subject: diffcore-rename: use is_empty_blob_oid
X-Git-Tag: v2.14.0-rc0~86^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/02491b67f3e4218176f3e6fe25961f1a8afade50

diffcore-rename: use is_empty_blob_oid

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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)) {
 			/*