diff options
| author |  Jeff King <peff@peff.net> | 2019-05-09 17:27:31 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-05-13 14:22:54 +0900 |
| commit | cf7a901ae4dff574e78d7b03bbaecfeb9dcc44d7 (patch) | |
| tree | c29cc740718b66dc238311f7ed0e97e91fc86d74 /builtin/rm.c | |
| parent | builtin: consistently pass cmd_* prefix to parse_options (diff) | |
| download | tgif-cf7a901ae4dff574e78d7b03bbaecfeb9dcc44d7.tar.xz | |
submodule: drop unused prefix parameter from some functions
We stopped using the "prefix" parameter of
relocate_single_git_dir_into_superproject() and its callers in
202275b96b (submodule.c: get_super_prefix_or_empty, 2017-03-14), where
we switched to using the environment global directly.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/rm.c')
| -rw-r--r-- | builtin/rm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index 90cbe896c9..be8edc6d1e 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -61,7 +61,7 @@ static void print_error_files(struct string_list *files_list, } } -static void submodules_absorb_gitdir_if_needed(const char *prefix) +static void submodules_absorb_gitdir_if_needed(void) { int i; for (i = 0; i < list.nr; i++) { @@ -83,7 +83,7 @@ static void submodules_absorb_gitdir_if_needed(const char *prefix) continue; if (!submodule_uses_gitfile(name)) - absorb_git_dir_into_superproject(prefix, name, + absorb_git_dir_into_superproject(name, ABSORB_GITDIR_RECURSE_SUBMODULES); } } @@ -313,7 +313,7 @@ int cmd_rm(int argc, const char **argv, const char *prefix) } if (!index_only) - submodules_absorb_gitdir_if_needed(prefix); + submodules_absorb_gitdir_if_needed(); /* * If not forced, the file, the index and the HEAD (if exists) |