diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-07-14 15:04:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-07-14 15:04:00 -0700 |
| commit | 361cbe6d6d24142d4b773f4077c07e25687680d6 (patch) | |
| tree | 4049494bd9180d33fd8a38141850c4a9aeb8495f /submodule.c | |
| parent | 0455aad1e39f21acbaa8a84129fec8eb77682e0d (diff) | |
| parent | 5b893f7d81eb7feb43662ed8663e2af76a76b4c8 (diff) | |
| download | git-361cbe6d6d24142d4b773f4077c07e25687680d6.tar.gz | |
Merge branch 'ab/submodule-cleanup'
Further preparation to turn git-submodule.sh into a builtin.
* ab/submodule-cleanup:
git-sh-setup.sh: remove "say" function, change last users
git-submodule.sh: use "$quiet", not "$GIT_QUIET"
submodule--helper: eliminate internal "--update" option
submodule--helper: understand --checkout, --merge and --rebase synonyms
submodule--helper: report "submodule" as our name in some "-h" output
submodule--helper: rename "absorb-git-dirs" to "absorbgitdirs"
submodule update: remove "-v" option
submodule--helper: have --require-init imply --init
git-submodule.sh: remove unused top-level "--branch" argument
git-submodule.sh: make the "$cached" variable a boolean
git-submodule.sh: remove unused $prefix variable
git-submodule.sh: remove unused sanitize_submodule_env()
Diffstat (limited to 'submodule.c')
| -rw-r--r-- | submodule.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.c b/submodule.c index 4e299f578f..2af16c647d 100644 --- a/submodule.c +++ b/submodule.c @@ -2374,7 +2374,7 @@ void absorb_git_dir_into_superproject(const char *path, cp.no_stdin = 1; strvec_pushl(&cp.args, "--super-prefix", sb.buf, "submodule--helper", - "absorb-git-dirs", NULL); + "absorbgitdirs", NULL); prepare_submodule_repo_env(&cp.env); if (run_command(&cp)) die(_("could not recurse into submodule '%s'"), path); |