diff options
| author |  Glen Choo <chooglen@google.com> | 2022-03-04 16:13:58 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2022-03-04 16:39:12 -0800 |
| commit | 29a5e9e1ffeadb0555fdd2f366f1cb7259462ab9 (patch) | |
| tree | a1659580fda9d81e217e5ce054dd24a01e5f4e42 /git-submodule.sh | |
| parent | submodule--helper: allow setting superprefix for init_submodule() (diff) | |
| download | tgif-29a5e9e1ffeadb0555fdd2f366f1cb7259462ab9.tar.xz | |
submodule--helper update-clone: learn --init
Teach "git submodule--helper update-clone" the --init flag and remove
the corresponding shell code.
When the `--init` flag is passed to the subcommand, we do not spawn a
new subprocess and call `submodule--helper init` on the submodule paths,
because the Git machinery is not able to pick up the configuration
changes introduced by that init call. So we instead run the
`init_submodule_cb()` callback over each submodule in the same process.
[1] https://lore.kernel.org/git/CAP8UFD0NCQ5w_3GtT_xHr35i7h8BuLX4UcHNY6VHPGREmDVObA@mail.gmail.com/
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 882bf097d5..16dea0ca59 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -361,14 +361,11 @@ cmd_update() usage fi - if test -n "$init" - then - cmd_init "--" "$@" || return - fi - { - git submodule--helper update-clone ${GIT_QUIET:+--quiet} \ + git ${wt_prefix:+-C "$wt_prefix"} submodule--helper update-clone \ + ${GIT_QUIET:+--quiet} \ ${progress:+"--progress"} \ + ${init:+--init} \ ${wt_prefix:+--prefix "$wt_prefix"} \ ${prefix:+--recursive-prefix "$prefix"} \ ${update:+--update "$update"} \ |