diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-11-08 15:10:38 +0100 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2022-11-08 20:55:30 +0100 |
| commit | 64f48ad1f036be2a09273051b28bfacf471cbfcc (patch) | |
| tree | 7de70bfeae0857ccf08624f0c4d780c5518ed275 | |
| parent | submodule API & "absorbgitdirs": remove "----recursive" option (diff) | |
| download | git-64f48ad1f036be2a09273051b28bfacf471cbfcc.tar.xz git-64f48ad1f036be2a09273051b28bfacf471cbfcc.zip | |
submodule--helper: remove --prefix from "absorbgitdirs"
Let's pass the "-C <prefix>" option instead to "absorbgitdirs" from
its only caller.
When it was added in f6f85861400 (submodule: add absorb-git-dir
function, 2016-12-12) there were other "submodule--helper" subcommands
that were invoked with "-C <prefix>", so we could have done this all
along.
Suggested-by: Glen Choo <chooglen@google.com>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
| -rw-r--r-- | builtin/submodule--helper.c | 3 | ||||
| -rwxr-xr-x | git-submodule.sh | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 33f099dbc8..fefedcf809 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2831,9 +2831,6 @@ static int absorb_git_dirs(int argc, const char **argv, const char *prefix) struct pathspec pathspec = { 0 }; struct module_list list = MODULE_LIST_INIT; struct option embed_gitdir_options[] = { - OPT_STRING(0, "prefix", &prefix, - N_("path"), - N_("path into the working tree")), OPT_END() }; const char *const git_submodule_helper_usage[] = { diff --git a/git-submodule.sh b/git-submodule.sh index 5e5d21c010..d359f17137 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -557,7 +557,7 @@ cmd_sync() cmd_absorbgitdirs() { - git submodule--helper absorbgitdirs --prefix "$wt_prefix" "$@" + git ${wt_prefix:+-C "$wt_prefix"} submodule--helper absorbgitdirs "$@" } # This loop parses the command line arguments to find the |