[PATCH 7/8] submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Nov 2, 2022, 07:54 UTC
- Message-ID
- <patch-7.8-77d4d5a6c09-20221102T074148Z-avarab@gmail.com>
- In-Reply-To
- <cover-0.8-00000000000-20221102T074148Z-avarab@gmail.com>
Since 29a5e9e1ffe (submodule--helper update-clone: learn --init, 2022-03-04) we've been passing "-C <prefix>" from "git-submodule.sh" whenever we pass "--prefix <prefix>", so the latter is redundant to the former. Let's drop the "--prefix" option.
Suggested-by: Glen Choo <chooglen@google.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/submodule--helper.c | 4 +--- git-submodule.sh | 1 - 2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index 6bbefd34374..2012ad31d7f 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2642,9 +2642,6 @@ static int module_update(int argc, const char **argv, const char *prefix) N_("traverse submodules recursively")), OPT_BOOL('N', "no-fetch", &opt.nofetch, N_("don't fetch new objects from the remote site")), - OPT_STRING(0, "prefix", &opt.prefix, - N_("path"), - N_("path into the working tree")), OPT_SET_INT(0, "checkout", &opt.update_default, N_("use the 'checkout' update strategy (default)"), SM_UPDATE_CHECKOUT), @@ -2700,6 +2697,7 @@ static int module_update(int argc, const char **argv, const char *prefix) } opt.filter_options = &filter_options; + opt.prefix = prefix; if (opt.update_default) opt.update_strategy.type = opt.update_default; diff --git a/git-submodule.sh b/git-submodule.sh index d359f171379..9a50f2e9124 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -343,7 +343,6 @@ cmd_update() ${recursive:+--recursive} \ ${init:+--init} \ ${nofetch:+--no-fetch} \ - ${wt_prefix:+--prefix "$wt_prefix"} \ ${rebase:+--rebase} \ ${merge:+--merge} \ ${checkout:+--checkout} \
-- 2.38.0.1280.g8136eb6fab2