{"thread":{"id":"50263","subject":"[PATCH] git-submodule: abort if core.worktree could not be set correctly","startedAt":"2019-01-18T21:55:27Z","lastAt":"2019-01-18T23:31:01Z","messageCount":3,"participants":["Stefan Beller","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"367148","messageId":"20190118215519.107700-1-sbeller@google.com","threadId":"50263","inReplyTo":null,"subject":"[PATCH] git-submodule: abort if core.worktree could not be set correctly","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2019-01-18T21:55:19Z","receivedAt":"2019-01-18T21:55:27Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by\nensure-core-worktree, 2018-08-13) forgot to exit the submodule operation\nif the helper could not ensure that core.worktree is set correctly.\n\nSigned-off-by: Stefan Beller <sbeller@google.com>\n---\n git-submodule.sh | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-submodule.sh b/git-submodule.sh\nindex 5e608f8bad3..02a0d728174 100755\n--- a/git-submodule.sh\n+++ b/git-submodule.sh\n@@ -548,7 +548,7 @@ cmd_update()\n \tdo\n \t\tdie_if_unmatched \"$quickabort\" \"$sha1\"\n \n-\t\tgit submodule--helper ensure-core-worktree \"$sm_path\"\n+\t\tgit submodule--helper ensure-core-worktree \"$sm_path\" || exit 1\n \n \t\tupdate_module=$(git submodule--helper update-module-mode $just_cloned \"$sm_path\" $update)\n \n-- \n2.20.1.101.g27c53b536e7.dirty\n\n"},{"id":"367158","messageId":"xmqqlg3himh8.fsf@gitster-ct.c.googlers.com","threadId":"50263","inReplyTo":"20190118215519.107700-1-sbeller@google.com","subject":"Re: [PATCH] git-submodule: abort if core.worktree could not be set correctly","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-01-18T23:18:11Z","receivedAt":"2019-01-18T23:18:17Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Stefan Beller <sbeller@google.com> writes:\n\n> 74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by\n> ensure-core-worktree, 2018-08-13) forgot to exit the submodule operation\n> if the helper could not ensure that core.worktree is set correctly.\n>\n> Signed-off-by: Stefan Beller <sbeller@google.com>\n> ---\n>  git-submodule.sh | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/git-submodule.sh b/git-submodule.sh\n> index 5e608f8bad3..02a0d728174 100755\n> --- a/git-submodule.sh\n> +++ b/git-submodule.sh\n> @@ -548,7 +548,7 @@ cmd_update()\n>  \tdo\n>  \t\tdie_if_unmatched \"$quickabort\" \"$sha1\"\n>  \n> -\t\tgit submodule--helper ensure-core-worktree \"$sm_path\"\n> +\t\tgit submodule--helper ensure-core-worktree \"$sm_path\" || exit 1\n\nGood to have more places check errors from underlying command.\n\nThanks.\n\nOut of curiousity, was this found by code inspection, or was there a\nreal-world breakage episode?\n\n"},{"id":"367160","messageId":"CAGZ79kY=LOmzQXja6mUiBOSSrmjvGsRDWzzXsq9vMsYWRw02Pw@mail.gmail.com","threadId":"50263","inReplyTo":"xmqqlg3himh8.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] git-submodule: abort if core.worktree could not be set correctly","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2019-01-18T23:30:45Z","receivedAt":"2019-01-18T23:31:01Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Fri, Jan 18, 2019 at 3:18 PM Junio C Hamano <gitster@pobox.com> wrote:\n>\n> Stefan Beller <sbeller@google.com> writes:\n>\n> > 74d4731da1f (submodule--helper: replace connect-gitdir-workingtree by\n> > ensure-core-worktree, 2018-08-13) forgot to exit the submodule operation\n> > if the helper could not ensure that core.worktree is set correctly.\n> >\n> > Signed-off-by: Stefan Beller <sbeller@google.com>\n> > ---\n> >  git-submodule.sh | 2 +-\n> >  1 file changed, 1 insertion(+), 1 deletion(-)\n> >\n> > diff --git a/git-submodule.sh b/git-submodule.sh\n> > index 5e608f8bad3..02a0d728174 100755\n> > --- a/git-submodule.sh\n> > +++ b/git-submodule.sh\n> > @@ -548,7 +548,7 @@ cmd_update()\n> >       do\n> >               die_if_unmatched \"$quickabort\" \"$sha1\"\n> >\n> > -             git submodule--helper ensure-core-worktree \"$sm_path\"\n> > +             git submodule--helper ensure-core-worktree \"$sm_path\" || exit 1\n>\n> Good to have more places check errors from underlying command.\n>\n> Thanks.\n>\n> Out of curiousity, was this found by code inspection, or was there a\n> real-world breakage episode?\n\nBy code inspection to come up with an answer for\nhttps://public-inbox.org/git/CAG0vfyQeA3Hm7AsYgYtP4v-Yg0=rKXW0YYfg_emAwEscZha4VA@mail.gmail.com/\n\nThat issue in itself is not fully solved (Duy is still looking into it),\nbut this fixes a minor inconsistency along the way.\n"}]}