mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sequencer: use the_hash_algo for empty tree object ID

Browse Source 
To ensure that we are hash algorithm agnostic, use the_hash_algo to look
up the object ID for the empty tree instead of using the empty_tree_oid
variable.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2018-05-02 00:26:05 +00:00
committed by Junio C Hamano
parent a055493436
commit 57911a31fe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sequencer.c
View File

@ -1119,7 +1119,7 @@ static int try_to_commit(struct strbuf *msg, const char *author,
if (!(flags & ALLOW_EMPTY) && !oidcmp(current_head ? if (!(flags & ALLOW_EMPTY) && !oidcmp(current_head ?
&current_head->tree->object.oid : &current_head->tree->object.oid :
&empty_tree_oid, &tree)) { the_hash_algo->empty_tree, &tree)) {
res = 1; /* run 'git commit' to display error message */ res = 1; /* run 'git commit' to display error message */
goto out; goto out;
} }