diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-13 21:28:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-13 21:28:54 (GMT) |
| commit | 721cc4314cb593e799213ad5f926a1e9fc5779b0 (patch) | |
| tree | ffa71b39724a9eed8dc7c653cafb4e1211e7820d /merge-recursive.c | |
| parent | 95ec6b1b3393eb6e26da40c565520a8db9796e9f (diff) | |
| parent | c250e02e2c6de8c116f4320a48ce44bbdb43015c (diff) | |
| download | git-721cc4314cb593e799213ad5f926a1e9fc5779b0.zip git-721cc4314cb593e799213ad5f926a1e9fc5779b0.tar.gz git-721cc4314cb593e799213ad5f926a1e9fc5779b0.tar.bz2 | |
Merge branch 'bc/hash-algo'
An infrastructure to define what hash function is used in Git is
introduced, and an effort to plumb that throughout various
codepaths has been started.
* bc/hash-algo:
repository: fix a sparse 'using integer as NULL pointer' warning
Switch empty tree and blob lookups to use hash abstraction
Integrate hash algorithm support with repo setup
Add structure representing hash algorithm
setup: expose enumerated repo info
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index d00b274..a4c280d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2082,7 +2082,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"); } |