From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Wed, 2 May 2018 00:25:57 +0000 (+0000)
Subject: merge: convert empty tree constant to the_hash_algo
X-Git-Tag: v2.18.0-rc0~17^2~13
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e9fe6f262eab9a262100cbd60355b8c0f346ff59

merge: convert empty tree constant to the_hash_algo

To avoid dependency on a particular hash algorithm, convert a use of
EMPTY_TREE_SHA1_HEX to use the_hash_algo->empty_tree instead.  Since
both branches now use oid_to_hex, condense the if statement into a
ternary.

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

diff --git a/merge.c b/merge.c
index f06a4773d4..5186cb6156 100644
--- a/merge.c
+++ b/merge.c
@@ -11,10 +11,7 @@
 
 static const char *merge_argument(struct commit *commit)
 {
-	if (commit)
-		return oid_to_hex(&commit->object.oid);
-	else
-		return EMPTY_TREE_SHA1_HEX;
+	return oid_to_hex(commit ? &commit->object.oid : the_hash_algo->empty_tree);
 }
 
 int index_has_changes(struct strbuf *sb)