diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-10-19 19:34:43 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-10-22 11:55:33 +0900 |
| commit | 6245b98b0e4e6c59b24794fa63f29b65d851569e (patch) | |
| tree | 390e99582c7e5ef06f9857e7f4dcad95ed231083 /builtin/pull.c | |
| parent | Fifth batch for 2.20 (diff) | |
| download | tgif-6245b98b0e4e6c59b24794fa63f29b65d851569e.tar.xz | |
submodule.c: remove some of the_repository references
Commit 174d131fc9 (submodule.c: remove implicit dependency on
the_index - 2018-09-21) makes collect_changed_submodules() take a
"struct index_state *" as argument even if it's not really used. My
bad.
Instead of deleting this argument and fixing up all call sites. Let's
take this opportunity to remove some the_repository instead because
there's one or two in this function (and two more in its callback).
The callers can also get rid of some the_repository.
Noticed-by: Jeff King <peff@peff.net>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
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 798ecf7faf..c21aa276f1 100644 --- 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; |