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 /submodule.h | |
| parent | a0789512c5a4ae7da935cd2e419f253cb3cb4ce7 (diff) | |
| parent | 69d94464e14de859ff56bcde7ebe0132201eceb9 (diff) | |
| download | git-1107a3963b566e41d25ee1a7e152db9b08a8fc6e.tar.gz | |
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 'submodule.h')
| -rw-r--r-- | submodule.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/submodule.h b/submodule.h index 6a9fec6de1..b52a4ff1e7 100644 --- a/submodule.h +++ b/submodule.h @@ -164,9 +164,7 @@ void submodule_unset_core_worktree(const struct submodule *sub); */ void prepare_submodule_repo_env(struct strvec *env); -#define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0) -void absorb_git_dir_into_superproject(const char *path, - unsigned flags); +void absorb_git_dir_into_superproject(const char *path); /* * Return the absolute path of the working tree of the superproject, which this |