From: Stefan Beller Date: Fri, 18 Jan 2019 21:55:19 +0000 (-0800) Subject: git-submodule: abort if core.worktree could not be set correctly X-Git-Tag: v2.21.0-rc0~16^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d124f419d1e9b7d22fae915627de7e463bf7c42;p=git 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 Signed-off-by: Junio C Hamano --- diff --git a/git-submodule.sh b/git-submodule.sh index 5e608f8bad..02a0d72817 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -548,7 +548,7 @@ cmd_update() 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)