diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-06 15:50:20 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-06 15:50:20 +0900 |
| commit | 1443ca9a7243d65d6b7d47ae5089cacbf0869ac4 (patch) | |
| tree | 45a0e7732c6a7d5dd3981a6bab82711597e88724 /builtin/pull.c | |
| parent | Merge branch 'nd/unpack-trees-with-cache-tree' (diff) | |
| parent | submodule.c: remove some of the_repository references (diff) | |
| download | tgif-1443ca9a7243d65d6b7d47ae5089cacbf0869ac4.tar.xz | |
Merge branch 'nd/submodule-unused-vars'
Code clean-up.
* nd/submodule-unused-vars:
submodule.c: remove some of the_repository references
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; |