From eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Sun, 12 Nov 2017 21:28:54 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- merge-recursive.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'merge-recursive.c') diff --git a/merge-recursive.c b/merge-recursive.c index 2ca8444c6..f89cc751e 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -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"); } -- cgit v1.2.1