[PATCH v2 30/42] sequencer: convert one use of EMPTY_TREE_SHA1_HEX
- From
brian m. carlson <sandals@crustytoothpaste.net>
- Date
- May 2, 2018, 00:25 UTC
- Message-ID
- <20180502002610.915892-31-sandals@crustytoothpaste.net>
- In-Reply-To
- <20180502002610.915892-1-sandals@crustytoothpaste.net>
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> --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sequencer.c b/sequencer.c index 5e3a50fafc..75ed9676fe 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1481,7 +1481,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); }