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 /builtin/rm.c | |
| 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 'builtin/rm.c')
| -rw-r--r-- | builtin/rm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/builtin/rm.c b/builtin/rm.c index f0d025a4e2..05bfe20a46 100644 --- a/builtin/rm.c +++ b/builtin/rm.c @@ -86,8 +86,7 @@ static void submodules_absorb_gitdir_if_needed(void) continue; if (!submodule_uses_gitfile(name)) - absorb_git_dir_into_superproject(name, - ABSORB_GITDIR_RECURSE_SUBMODULES); + absorb_git_dir_into_superproject(name); } } |