Merge branch 'ab/pack-tests-cleanup'

diff --git a/builtin/pull.c b/builtin/pull.c
index 798ecf7faf186ba337cc73e945ac0c7fefd94866..c21aa276f1e93ef2593397d5304e72d59e6914b0 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -945,7 +945,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
                int ret = 0;
                if ((recurse_submodules == RECURSE_SUBMODULES_ON ||
                     recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
-                   submodule_touches_in_range(&the_index, &rebase_fork_point, &curr_head))
+                   submodule_touches_in_range(the_repository, &rebase_fork_point, &curr_head))
                        die(_("cannot rebase with locally recorded submodule modifications"));
                if (!autostash) {
                        struct commit_list *list = NULL;