[PATCH] submodule update: run custom update script for initial populating as well
- From
Stefan Beller <sbeller@google.com>
- Date
- Jan 13, 2017, 19:43 UTC
- Message-ID
- <20170113194326.13950-1-sbeller@google.com>
In 1b4735d9f3 (submodule: no [--merge|--rebase] when newly cloned, 2011-02-17), all actions were defaulted to checkout for populating a submodule initially, because merging or rebasing makes no sense in that situation.
Other commands however do make sense, such as the custom command that was added later (6cb5728c43, submodule update: allow custom command to update submodule working tree, 2013-07-03).
I am unsure about the "none" command, as I can see an initial checkout there as a useful thing. On the other hand going strictly by our own documentation, we should do nothing in case of "none" as well, because the user asked for it.
Reported-by: Han-Wen Nienhuys <hanwen@google.com> Signed-off-by: Stefan Beller <sbeller@google.com> --- git-submodule.sh | 7 ++++++- t/t7406-submodule-update.sh | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 554bd1c494..aeb721ab7e 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -606,7 +606,12 @@ cmd_update() if test $just_cloned -eq 1 then subsha1= - update_module=checkout + if test "$update_module" = "merge" || + test "$update_module" = "rebase" || + test "$update_module" = "none" + then + update_module=checkout + fi else subsha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify HEAD) || diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 64f322c4cc..1407fa6098 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -424,6 +424,19 @@ test_expect_success 'submodule update - command in .git/config catches failure - test_i18ncmp actual expect ' +test_expect_success 'submodule update - command run for initial population of submodule' ' + cat <<-\ EOF >expect + Execution of '\''false $submodulesha1'\'' failed in submodule path '\''submodule'\'' + EOF + ( + cd super && + rm -rf submodule + test_must_fail git submodule update >../actual + ) + test_cmp expect actual + git -C super submodule update --checkout +' + cat << EOF >expect Execution of 'false $submodulesha1' failed in submodule path '../super/submodule' Failed to recurse into submodule path '../super' @@ -476,6 +489,7 @@ test_expect_success 'submodule init picks up merge' ' ' test_expect_success 'submodule update --merge - ignores --merge for new submodules' ' + test_config -C super submodule.submodule.update checkout && (cd super && rm -rf submodule && git submodule update submodule && @@ -488,6 +502,7 @@ test_expect_success 'submodule update --merge - ignores --merge for new submod ' test_expect_success 'submodule update --rebase - ignores --rebase for new submodules' ' + test_config -C super submodule.submodule.update checkout && (cd super && rm -rf submodule && git submodule update submodule &&
-- 2.11.0.300.g08194d1431.dirty