diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 15:57:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 16:51:18 (GMT) |
| commit | 174d131fc92b72a04c3da4259dd8bf356e07fc49 (patch) | |
| tree | 2b6dfb97d60550590be21a68d90cd4a6dc2e6f4a /builtin | |
| parent | 80e03855413c7ac3727df572d44131656e467426 (diff) | |
| download | git-174d131fc92b72a04c3da4259dd8bf356e07fc49.zip git-174d131fc92b72a04c3da4259dd8bf356e07fc49.tar.gz git-174d131fc92b72a04c3da4259dd8bf356e07fc49.tar.bz2 | |
submodule.c: remove implicit dependency on the_index
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')
| -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 33b7100..9c45598 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -944,7 +944,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(&rebase_fork_point, &curr_head)) + submodule_touches_in_range(&the_index, &rebase_fork_point, &curr_head)) die(_("cannot rebase with locally recorded submodule modifications")); if (!autostash) { struct commit_list *list = NULL; |