git-submodule: abort if core.worktree could not be set correctly
PATCH 1/1 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.
--- git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
git-submodule.sh +1 -1
@@ -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)
Signature · 1 line
2.20.1.101.g27c53b536e7.dirty
Quoted 14 lines · Stefan Beller
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 <[email protected]>--- git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)git-submodule.sh +0
-0
git-submodule.sh cmd_update() · line 551
Quoted 5 lines
git-submodule.sh +1
-1@@ -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
Good to have more places check errors from underlying command.
Thanks.
Out of curiousity, was this found by code inspection, or was there a real-world breakage episode?
Quoted 25 lines · Junio C Hamano
Quoted 14 lines · Stefan Beller
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 <[email protected]>--- git-submodule.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)git-submodule.sh +0
-0git-submodule.sh cmd_update() · line 551
Quoted 5 lines
git-submodule.sh +1
-1@@ -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 1Good to have more places check errors from underlying command.
Quoted 4 lines
Thanks.
Out of curiousity, was this found by code inspection, or was there a real-world breakage episode?
By code inspection to come up with an answer for
https://public-inbox.org/git/CAG0vfyQeA3Hm7AsYgYtP4v-Yg0=rKXW0YYfg_emAwEscZha4VA@mail.gmail.com/
That issue in itself is not fully solved (Duy is still looking into it), but this fixes a minor inconsistency along the way.