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>
Stefan Beller committed
Jan 18, 2019 at 13:55 UTC
5d124f419d1e9b7d22fae915627de7e463bf7c42
1 file changed
+1
-1
git-submodule.sh
+1
-1
@@ -548,7 +548,7 @@ cmd_update()
548
do
549
die_if_unmatched "$quickabort" "$sha1"
550
551
- git submodule--helper ensure-core-worktree "$sm_path"
551
+ git submodule--helper ensure-core-worktree "$sm_path" || exit 1
552
553
update_module=$(git submodule--helper update-module-mode $just_cloned "$sm_path" $update)
554