Skip to contentSkip to conversation

submodule--helper: accept '-i' shorthand for update --init

PATCH In review Dominique Martinet 2 participants 2 messages Jul 8

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 submodule--helper: accept '-i' shorthand for update --init

commit 3ad0ba722744 ("git-submodule.sh: improve variables readability") made git submodules update -i pass -i as is to submodule--helper, but it fails with error: unknown switch i'` because the helper does not accept the short option.

All other short options supported by git-submodule.sh are properly handle in the helper, so also add the alias for --init

Fixes 3ad0ba722744 ("git-submodule.sh: improve variables readability")

---
This apparently can't be used much because it's been broken since v2.49, and it's not in the help, but I guess we might as well fix this since it used to work?

Thanks!

---
 builtin/submodule--helper.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
builtin/submodule--helper.c +1 -1
index 1cc82a134db2..3ec8bf50532e 100644
@@ -2990,7 +2990,7 @@ static int module_update(int argc, const char **argv, const char *prefix,
 	struct option module_update_options[] = {
 		OPT__SUPER_PREFIX(&opt.super_prefix),
 		OPT__FORCE(&opt.force, N_("force checkout updates"), 0),
-		OPT_BOOL(0, "init", &opt.init,
+		OPT_BOOL('i', "init", &opt.init,
 			 N_("initialize uninitialized submodules before update")),
 		OPT_BOOL(0, "remote", &opt.remote,
 			 N_("use SHA-1 of submodule's remote tracking branch")),

---
base-commit: 11320dd2066f2139870e36987240abc981cb493c

#1 lore raw
Quoted 8 lines · Dominique Martinet

commit 3ad0ba722744 ("git-submodule.sh: improve variables readability") made git submodules update -i pass -i as is to submodule--helper, but it fails with error: unknown switch i'` because the helper does not accept the short option.

All other short options supported by git-submodule.sh are properly handle in the helper, so also add the alias for --init

Quoted 6 lines
Fixes 3ad0ba722744 ("git-submodule.sh: improve variables readability")

---
This apparently can't be used much because it's been broken since v2.49, and it's not in the help, but I guess we might as well fix this since it used to work?

3ad0ba7227 (git-submodule.sh: improve variables readability, 2024-12-11) is v2.49.0-rc0~107^2~1 and indeed we broke it and nobody has noticed and reported since then. An obvious alternative would be to give a single-liner:

git-submodule.sh +1 -1
index 2999b31fad..9a989edb20 100755
@@ -285,7 +285,7 @@ cmd_update()
 			progress=$1
 			;;
 		-i|--init)
-			init=$1
+			init=--init
 			;;
 		--require-init)
 			require_init=$1

but since anybody should be directly running "git submodule--helper" by hand, I think it is perfectly fine to teach it a short-option like your patch does.

Will apply. Thanks.