diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-11-12 21:28:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-13 04:20:44 (GMT) |
| commit | eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4 (patch) | |
| tree | 9042f094bd1f12d1249d714fdd177fcbe4fbf2a4 /merge-recursive.c | |
| parent | 78a6766802ef32b82e6062e8e6ac5621894cc4a2 (diff) | |
| download | git-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.zip git-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.tar.gz git-eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4.tar.bz2 | |
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>
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 2ca8444..f89cc75 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"); } |