diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-11-23 11:22:22 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-11-23 11:22:22 +0900 |
| commit | 1107a3963b566e41d25ee1a7e152db9b08a8fc6e (patch) | |
| tree | 3fc2408ca15f949e76ab6e82e3d7a6c2d2dcf22e /git-submodule.sh | |
| parent | The thirteenth batch (diff) | |
| parent | submodule--helper: use OPT_SUBCOMMAND() API (diff) | |
| download | git-1107a3963b566e41d25ee1a7e152db9b08a8fc6e.tar.gz git-1107a3963b566e41d25ee1a7e152db9b08a8fc6e.zip | |
Merge branch 'ab/submodule-helper-prep-only'
Preparation to remove git-submodule.sh and replace it with a builtin.
* ab/submodule-helper-prep-only:
submodule--helper: use OPT_SUBCOMMAND() API
submodule--helper: drop "update --prefix <pfx>" for "-C <pfx> update"
submodule--helper: remove --prefix from "absorbgitdirs"
submodule API & "absorbgitdirs": remove "----recursive" option
submodule.c: refactor recursive block out of absorb function
submodule tests: test for a "foreach" blind-spot
submodule--helper: fix a memory leak in "status"
submodule tests: add tests for top-level flag output
submodule--helper: move "config" to a test-tool
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 5e5d21c010..9a50f2e912 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} \ @@ -557,7 +556,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 |