Re: [PATCH] recursive submodules: detach HEAD from new state

From: Stefan Beller <sbeller@google.com>
Date: Nov 21, 2017, 22:45 UTC
Message-ID: <CAGZ79kZxD4r0J+uZCuBStkZq1mqPSTaOdkpyOmPXjdLLr6rkOQ@mail.gmail.com>
In-Reply-To: <20171121223449.GI3429@aiede.mtv.corp.google.com>

On Tue, Nov 21, 2017 at 2:34 PM, Jonathan Nieder <jrnieder@gmail.com> wrote:

Show 16 quoted lines

> Stefan Beller wrote:
>>> Junio C Hamano <gitster@pobox.com> writes:
>
>>>> Also, while I do agree with you that the problem exists, it is
>>>> unclear why this patch is a solution and not a hack that sweeps a
>>>> problem under the rug.
>>>>
>>>> It is unclear why this "silently detach HEAD without telling the
>>>> user" is a better solution than erroring out, for example [*1*].
> [...]
>> So I took a step back and wrote about different proposals where
>> we want to go long term. See below. This will help us
>> figuring out how to approach this bug correctly.
>
> Stefan, do you know what thread I should look at to find the current
> state of this patch?  I've had it applied locally for a long time.

It was "Undecided" for some time, then Junio kicked it back to pu, expecting a reroll[1]. The "send out a plan" that was referenced is found in [2] describing 6 plans for the future of submodules. The approach in [3] which is different on the implementation level, but very similar on the UX level sounds best currently. I'll coordinate with JTan to come up with patches for that.

[1] https://public-inbox.org/git/CAGZ79kYUZv0g+3OEMrbT26A7mSLJzeS-yf5Knr-CnARHqVB=aQ@mail.gmail.com/ [2] https://public-inbox.org/git/20171109001007.11894-1-sbeller@google.com/ [3] https://public-inbox.org/git/20171108172945.33c42a0e91b4ac494217b788@google.com/

Show 21 quoted lines

> The thread I am replying to appears to be where the patch comes from
> but I have some memories of more recent discussion that I'm not
> finding.
>
> More context:
> https://public-inbox.org/git/xmqqshd8i3ze.fsf@gitster.mtv.corp.google.com/
> says
>
>  * sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits
>   - Documentation/checkout: clarify submodule HEADs to be detached
>   - recursive submodules: detach HEAD from new state
>
>   "git checkout --recursive" may overwrite and rewind the history of
>   the branch that happens to be checked out in submodule
>   repositories, which might not be desirable.  Detach the HEAD but
>   still allow the recursive checkout to succeed in such a case.
>
>   Expecting a reroll.
>
> Thanks,
> Jonathan