Merge branch 'bw/pathspec-match-submodule-boundary'

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3faae382de4fa345f6d54c9120d33ed86c02e2cc..e1e157d205a06ffad39a9685cab55b16c69d339c 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -514,7 +514,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
                }
                tree = parse_tree_indirect(old->commit ?
                                           &old->commit->object.oid :
-                                          &empty_tree_oid);
+                                          the_hash_algo->empty_tree);
                init_tree_desc(&trees[0], tree->buffer, tree->size);
                tree = parse_tree_indirect(&new->commit->object.oid);
                init_tree_desc(&trees[1], tree->buffer, tree->size);