mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-23 18:05:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"

Browse Source 
Since 29a5e9e1ff (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>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason 2022-11-08 15:10:39 +01:00 committed by Taylor Blau
parent 64f48ad1f0
commit 1b6e2001c7
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/submodule--helper.c
View File

@ -2643,9 +2643,6 @@ static int module_update(int argc, const char **argv, const char *prefix)
N_("traverse submodules recursively")), N_("traverse submodules recursively")),
OPT_BOOL('N', "no-fetch", &opt.nofetch, OPT_BOOL('N', "no-fetch", &opt.nofetch,
N_("don't fetch new objects from the remote site")), 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, OPT_SET_INT(0, "checkout", &opt.update_default,
N_("use the 'checkout' update strategy (default)"), N_("use the 'checkout' update strategy (default)"),
SM_UPDATE_CHECKOUT), SM_UPDATE_CHECKOUT),
@ -2701,6 +2698,7 @@ static int module_update(int argc, const char **argv, const char *prefix)
} }
opt.filter_options = &filter_options; opt.filter_options = &filter_options;
opt.prefix = prefix;
if (opt.update_default) if (opt.update_default)
opt.update_strategy.type = opt.update_default; opt.update_strategy.type = opt.update_default;

1
git-submodule.sh
View File

@ -343,7 +343,6 @@ cmd_update()
${recursive:+--recursive} \ ${recursive:+--recursive} \
${init:+--init} \ ${init:+--init} \
${nofetch:+--no-fetch} \ ${nofetch:+--no-fetch} \
${wt_prefix:+--prefix "$wt_prefix"} \
${rebase:+--rebase} \ ${rebase:+--rebase} \
${merge:+--merge} \ ${merge:+--merge} \
${checkout:+--checkout} \ ${checkout:+--checkout} \