diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2017-11-13 00:28:54 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-13 07:20:44 +0300 |
commit | eb0ccfd7f5ce1765ada74abf272f002e1e34d1e4 (patch) | |
tree | 9042f094bd1f12d1249d714fdd177fcbe4fbf2a4 /builtin/pull.c | |
parent | 78a6766802ef32b82e6062e8e6ac5621894cc4a2 (diff) |
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 'builtin/pull.c')
-rw-r--r-- | builtin/pull.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index a28f0ffadd..3d26f8ff32 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -545,7 +545,7 @@ static int pull_into_void(const struct object_id *merge_head, * index/worktree changes that the user already made on the unborn * branch. */ - if (checkout_fast_forward(&empty_tree_oid, merge_head, 0)) + if (checkout_fast_forward(the_hash_algo->empty_tree, merge_head, 0)) return 1; if (update_ref("initial pull", "HEAD", merge_head, curr_head, 0, UPDATE_REFS_DIE_ON_ERR)) |