From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Wed, 2 May 2018 00:25:58 +0000 (+0000)
Subject: sequencer: convert one use of EMPTY_TREE_SHA1_HEX
X-Git-Tag: v2.18.0-rc0~17^2~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/7a915b4b743d13e57f2a65494f19055617fd4406?ds=sidebyside;hp=e9fe6f262eab9a262100cbd60355b8c0f346ff59

sequencer: convert one use of EMPTY_TREE_SHA1_HEX

Convert one use of EMPTY_TREE_SHA1_HEX to use empty_tree_oid_hex to
avoid a dependency on a given hash algorithm.

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

diff --git a/sequencer.c b/sequencer.c
index 667f35ebdf..1ccc778259 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -1480,7 +1480,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
 		unborn = get_oid("HEAD", &head);
 		if (unborn)
 			oidcpy(&head, the_hash_algo->empty_tree);
-		if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD",
+		if (index_differs_from(unborn ? empty_tree_oid_hex() : "HEAD",
 				       NULL, 0))
 			return error_dirty_index(opts);
 	}