[PATCH v2 30/42] sequencer: convert one use of EMPTY_TREE_SHA1_HEX
flat view
STALE3082d
From: brian m. carlson <hidden>
Date: 2018-05-02 00:27:50
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 2 in this series.
Revisions (2)
- v1 [diff vs current]
- v2 current
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 <redacted> --- 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); }