git/git-submodule.sh, branch v2.48.2

builtin/submodule: allow "add" to use different ref storage format

2024-08-08T16:22:21Z

Same as with "clone", users may want to add a submodule to a repository with a non-default ref storage format. Wire up a new `--ref-format=` option that works the same as for `git submodule clone`. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

builtin/submodule: allow cloning with different ref storage format

2024-08-08T16:20:49Z

As submodules are proper self-contained repositories, it is perfectly valid for them to have a different ref storage format than their parent repository. There is no obvious way for users to ask for the ref storage format when initializing submodules though. Whether the setup of such mixed-ref-storage-format constellations is all that useful remains to be seen. But there is no good reason to not expose such an option, and we will require it in a subsequent patch. Introduce a new `--ref-format=` option for git-submodule(1) that allows the user to pick the ref storage format. This option will also be used in a subsequent commit, where we start to propagate the same flag from git-clone(1) to cloning submodules with the `--recursive` switch. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

git-submodule.sh: break overly long command lines

2024-08-08T16:20:48Z

For most of the subcommands of git-submodule(1), we end up passing a bunch of arguments to the submodule helper. This quickly leads to overly long lines, where it becomes hard to spot what has changed when one needs to modify them. Break up these lines into one argument per line, similarly to how it is done for the "clone" subcommand already. Signed-off-by: Patrick Steinhardt Signed-off-by: Junio C Hamano

Merge branch 'ss/pull-v-recurse-fix'

2022-12-28T03:06:17Z

"git pull -v --recurse-submodules" attempted to pass "-v" down to underlying "git submodule update", which did not understand the request and barfed, which has been corrected. * ss/pull-v-recurse-fix: submodule: accept -v for the update command

submodule: accept -v for the update command

2022-12-18T01:28:30Z

Since a56771a6 (builtin/pull: respect verbosity settings in submodules, 2018-01-25), "git pull -v --recurse-submodules" propagates the "-v" to the submodule command, but because the latter command does not understand the option, it barfs. Teach "git submodule update" to accept the option to fix it. Signed-off-by: Sven Strickroth Signed-off-by: Junio C Hamano

submodule--helper: drop "update --prefix " for "-C update"

2022-11-08T19:55:30Z

Since 29a5e9e1ffe (submodule--helper update-clone: learn --init, 2022-03-04) we've been passing "-C " from "git-submodule.sh" whenever we pass "--prefix ", so the latter is redundant to the former. Let's drop the "--prefix" option. Suggested-by: Glen Choo Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Taylor Blau

submodule--helper: remove --prefix from "absorbgitdirs"

2022-11-08T19:55:30Z

Let's pass the "-C " 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 ", so we could have done this all along. Suggested-by: Glen Choo Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Taylor Blau

git-submodule.sh: use "$quiet", not "$GIT_QUIET"

2022-06-28T20:13:18Z

Remove the use of the "$GIT_QUIET" variable in favor of our own "$quiet", ever since b3c5f5cb048 (submodule: move core cmd_update() logic to C, 2022-03-15) we have not used the "say" function in git-sh-setup.sh, which is the only thing that's affected by using "GIT_QUIET". We still want to support --quiet for our own use though, but let's use our own variable for that. Now it's obvious that we only care about passing "--quiet" to "git submodule--helper", and not to change the output of any "say" invocation. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

submodule--helper: understand --checkout, --merge and --rebase synonyms

2022-06-28T20:13:17Z

Understand --checkout, --merge and --rebase synonyms for --update={checkout,merge,rebase}, as well as the short options that 'git submodule' itself understands. This removes a difference between the CLI API of "git submodule" and "git submodule--helper", making it easier to make the latter an alias for the former. See 48308681b07 (git submodule update: have a dedicated helper for cloning, 2016-02-29) for the initial addition of --update. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"

2022-06-28T20:13:17Z

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 Signed-off-by: Junio C Hamano