submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"
Rename the "absorb-git-dirs" subcommand to "absorbgitdirs", which is
what the "git submodule" command itself has called it since the
subcommand was implemented in f6f8586140
(submodule: add
absorb-git-dir function, 2016-12-12).
Having these two be different will make it more tedious to dispatch to
eventually dispatch "git submodule--helper" directly, as we'd need to
retain this name mapping. So let's get rid of this needless
inconsistency.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
parent
0d68ee723e
commit
6e556c412e
|
@ -2787,7 +2787,7 @@ static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *const git_submodule_helper_usage[] = {
|
const char *const git_submodule_helper_usage[] = {
|
||||||
N_("git submodule--helper absorb-git-dirs [<options>] [<path>...]"),
|
N_("git submodule--helper absorbgitdirs [<options>] [<path>...]"),
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -3389,7 +3389,7 @@ static struct cmd_struct commands[] = {
|
||||||
{"deinit", module_deinit, 0},
|
{"deinit", module_deinit, 0},
|
||||||
{"summary", module_summary, SUPPORT_SUPER_PREFIX},
|
{"summary", module_summary, SUPPORT_SUPER_PREFIX},
|
||||||
{"push-check", push_check, 0},
|
{"push-check", push_check, 0},
|
||||||
{"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
|
{"absorbgitdirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
|
||||||
{"is-active", is_active, 0},
|
{"is-active", is_active, 0},
|
||||||
{"check-name", check_name, 0},
|
{"check-name", check_name, 0},
|
||||||
{"config", module_config, 0},
|
{"config", module_config, 0},
|
||||||
|
|
|
@ -552,7 +552,7 @@ cmd_sync()
|
||||||
|
|
||||||
cmd_absorbgitdirs()
|
cmd_absorbgitdirs()
|
||||||
{
|
{
|
||||||
git submodule--helper absorb-git-dirs --prefix "$wt_prefix" "$@"
|
git submodule--helper absorbgitdirs --prefix "$wt_prefix" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
# This loop parses the command line arguments to find the
|
# This loop parses the command line arguments to find the
|
||||||
|
|
|
@ -2374,7 +2374,7 @@ void absorb_git_dir_into_superproject(const char *path,
|
||||||
cp.no_stdin = 1;
|
cp.no_stdin = 1;
|
||||||
strvec_pushl(&cp.args, "--super-prefix", sb.buf,
|
strvec_pushl(&cp.args, "--super-prefix", sb.buf,
|
||||||
"submodule--helper",
|
"submodule--helper",
|
||||||
"absorb-git-dirs", NULL);
|
"absorbgitdirs", NULL);
|
||||||
prepare_submodule_repo_env(&cp.env);
|
prepare_submodule_repo_env(&cp.env);
|
||||||
if (run_command(&cp))
|
if (run_command(&cp))
|
||||||
die(_("could not recurse into submodule '%s'"), path);
|
die(_("could not recurse into submodule '%s'"), path);
|
||||||
|
|
Loading…
Reference in New Issue