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

Switch empty tree and blob lookups to use hash abstraction

Browse Source 
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:
brian m. carlson
2017-11-12 21:28:54 +00:00
committed by Junio C Hamano
parent 78a6766802
commit eb0ccfd7f5
10 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.c
View File

@ -2081,7 +2081,7 @@ int merge_recursive(struct merge_options *o,
/* if there is no common ancestor, use an empty tree */
struct tree *tree;
tree = lookup_tree(&empty_tree_oid);
tree = lookup_tree(the_hash_algo->empty_tree);
merged_common_ancestors = make_virtual_commit(tree, "ancestor");
}