diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-12-14 00:28:54 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-14 00:28:54 +0300 |
| commit | 721cc4314cb593e799213ad5f926a1e9fc5779b0 (patch) | |
| tree | ffa71b39724a9eed8dc7c653cafb4e1211e7820d /builtin/pull.c | |
| parent | 95ec6b1b3393eb6e26da40c565520a8db9796e9f (diff) | |
| parent | c250e02e2c6de8c116f4320a48ce44bbdb43015c (diff) | |
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 '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 166b777ed6..511dbbe0f6 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -557,7 +557,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)) |