git-submodule: abort if core.worktree could not be set correctly

74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by
ensure-core-worktree, 2018-08-13) forgot to exit the submodule operation
if the helper could not ensure that core.worktree is set correctly.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-submodule.sh b/git-submodule.sh
index 5e608f8bad305fea40e9063b854bf1be24ebd448..02a0d728174a0201c966abd73299d03c198d03b4 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -548,7 +548,7 @@ cmd_update()
        do
                die_if_unmatched "$quickabort" "$sha1"
 
        do
                die_if_unmatched "$quickabort" "$sha1"
 

-               git submodule--helper ensure-core-worktree "$sm_path"
+               git submodule--helper ensure-core-worktree "$sm_path" || exit 1

 
                update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update)
 
 
                update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update)