unpack-trees: oneway_merge to update submodules

diff --git a/builtin/pull.c b/builtin/pull.c
index 166b777ed69073f44f82e8052a0bdb6f287d22a9..511dbbe0f6e25d8f0e8c6ce511cc0ff734adc9bc 100644 (file)
--- 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))