mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
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>
This commit is contained in:
parent
e9fe6f262e
commit
7a915b4b74
|
@ -1480,7 +1480,7 @@ static int do_pick_commit(enum todo_command command, struct commit *commit,
|
||||||
unborn = get_oid("HEAD", &head);
|
unborn = get_oid("HEAD", &head);
|
||||||
if (unborn)
|
if (unborn)
|
||||||
oidcpy(&head, the_hash_algo->empty_tree);
|
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))
|
NULL, 0))
|
||||||
return error_dirty_index(opts);
|
return error_dirty_index(opts);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue