From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Wed, 2 May 2018 00:26:06 +0000 (+0000)
Subject: dir: use the_hash_algo for empty blob object ID
X-Git-Tag: v2.18.0-rc0~17^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba2df7519afa4606fb97e1e83be41342b40bc451;p=thirdparty%2Fgit.git

dir: use the_hash_algo for empty blob object ID

To ensure that we are hash algorithm agnostic, use the_hash_algo to look
up the object ID for the empty blob instead of using the empty_tree_oid
variable.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/dir.c b/dir.c
index 06f4c4a8bf..e879c34c2e 100644
--- a/dir.c
+++ b/dir.c
@@ -828,7 +828,7 @@ static int add_excludes(const char *fname, const char *base, int baselen,
 		if (size == 0) {
 			if (oid_stat) {
 				fill_stat_data(&oid_stat->stat, &st);
-				oidcpy(&oid_stat->oid, &empty_blob_oid);
+				oidcpy(&oid_stat->oid, the_hash_algo->empty_blob);
 				oid_stat->valid = 1;
 			}
 			close(fd);