]> git.ipfire.org Git - thirdparty/git.git/commitdiff
submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 28 Jun 2022 10:05:29 +0000 (12:05 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jun 2022 20:13:17 +0000 (13:13 -0700)
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 f6f85861400 (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>
builtin/submodule--helper.c
git-submodule.sh
submodule.c

index f0702d0cfa22934a45c9e23c1ba2a3ad439c8ead..1a84ae8efd2a4a26658fa60f96b6cb49cb6ac655 100644 (file)
@@ -2787,7 +2787,7 @@ static int absorb_git_dirs(int argc, const char **argv, const char *prefix)
        };
 
        const char *const git_submodule_helper_usage[] = {
-               N_("git submodule--helper absorb-git-dirs [<options>] [<path>...]"),
+               N_("git submodule--helper absorbgitdirs [<options>] [<path>...]"),
                NULL
        };
 
@@ -3389,7 +3389,7 @@ static struct cmd_struct commands[] = {
        {"deinit", module_deinit, 0},
        {"summary", module_summary, SUPPORT_SUPER_PREFIX},
        {"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},
        {"check-name", check_name, 0},
        {"config", module_config, 0},
index 0df6b0fc974ed08c1dc87b4b7e47ae823deaacc8..1c1dc320922ed0d62379464ee7fcb501da7688ff 100755 (executable)
@@ -552,7 +552,7 @@ cmd_sync()
 
 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
index 4e299f578f96f17110114f441e6370085c452e40..2af16c647d5f6deede8456e98cae8beebd7baa43 100644 (file)
@@ -2374,7 +2374,7 @@ void absorb_git_dir_into_superproject(const char *path,
                cp.no_stdin = 1;
                strvec_pushl(&cp.args, "--super-prefix", sb.buf,
                             "submodule--helper",
-                            "absorb-git-dirs", NULL);
+                            "absorbgitdirs", NULL);
                prepare_submodule_repo_env(&cp.env);
                if (run_command(&cp))
                        die(_("could not recurse into submodule '%s'"), path);