diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2018-05-02 00:25:58 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-02 04:59:52 (GMT) |
| commit | 7a915b4b743d13e57f2a65494f19055617fd4406 (patch) | |
| tree | f2d332e4273570a7d0540affa9a7105f1c662dde /sequencer.c | |
| parent | e9fe6f262eab9a262100cbd60355b8c0f346ff59 (diff) | |
| download | git-7a915b4b743d13e57f2a65494f19055617fd4406.zip git-7a915b4b743d13e57f2a65494f19055617fd4406.tar.gz git-7a915b4b743d13e57f2a65494f19055617fd4406.tar.bz2 | |
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>
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 667f35e..1ccc778 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); } |