Switch empty tree and blob lookups to use hash abstraction
Switch the uses of empty_tree_oid and empty_blob_oid to use the current_hash abstraction that represents the current hash algorithm in use. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
78a6766802
commit
eb0ccfd7f5
@ -514,7 +514,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
|
||||
}
|
||||
tree = parse_tree_indirect(old->commit ?
|
||||
&old->commit->object.oid :
|
||||
&empty_tree_oid);
|
||||
the_hash_algo->empty_tree);
|
||||
init_tree_desc(&trees[0], tree->buffer, tree->size);
|
||||
tree = parse_tree_indirect(&new->commit->object.oid);
|
||||
init_tree_desc(&trees[1], tree->buffer, tree->size);
|
||||
|
Reference in New Issue
Block a user