From: Junio C Hamano <gitster@pobox.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Stefan Beller <sbeller@google.com>, git@vger.kernel.org
Subject: Re: [PATCH] recursive submodules: detach HEAD from new state
Date: Mon, 24 Jul 2017 14:33:54 -0700 [thread overview]
Message-ID: <xmqq8tjdcyf1.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170724180312.GE13924@aiede.mtv.corp.google.com> (Jonathan Nieder's message of "Mon, 24 Jul 2017 11:03:12 -0700")
Jonathan Nieder <jrnieder@gmail.com> writes:
> Yikes. Yes, this bug looks problematic. Thanks for working on it.
>
>> I improved the commit message laying out the current state of affairs,
>> arguing that any future plan should not weigh in as much as the current
>> possible data loss.
>
> Can you elaborate on what you mean about data loss? At first glance
> it would seem to me that detaching HEAD could lead to data loss since
> there isn't a branch to keep track of the user's work. Are you saying
> the current behavior of updating whatever branch HEAD is on (which,
> don't get me wrong, is a wrong behavior that needs fixing) bypassed
> the reflog?
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*].
[Footnote]
*1* For example, I would imagine that the problem can also be
"fixed" by detecting that the HEAD is on a branch, and noticing
that it will force rewinding of that branch if we did update-ref
in this codepath, and signal the failure to the caller of
submodule_move_head() without making the damage larger. And
tell the user what is going on, and perhaps suggest to detach
HEAD to avoid clobbering their branch.
>
> Thanks, Jonathan
>
>> [1] https://public-inbox.org/git/20170630003851.17288-1-sbeller@google.com/
> [...]
>> --- a/submodule.c
>> +++ b/submodule.c
>> @@ -1653,7 +1653,8 @@ int submodule_move_head(const char *path,
>> cp.dir = path;
>>
>> prepare_submodule_repo_env(&cp.env_array);
>> - argv_array_pushl(&cp.args, "update-ref", "HEAD", new, NULL);
>> + argv_array_pushl(&cp.args, "update-ref", "HEAD",
>> + "--no-deref", new, NULL);
>>
>> if (run_command(&cp)) {
>> ret = -1;
next prev parent reply other threads:[~2017-07-24 21:34 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 17:36 [PATCH] recursive submodules: detach HEAD from new state Stefan Beller
2017-07-24 18:03 ` Jonathan Nieder
2017-07-24 19:07 ` Stefan Beller
2017-07-24 20:57 ` Junio C Hamano
2017-07-24 21:33 ` Junio C Hamano [this message]
2017-07-24 22:23 ` Junio C Hamano
2017-07-25 22:27 ` Stefan Beller
2017-07-26 19:36 ` Junio C Hamano
2017-11-21 22:34 ` Jonathan Nieder
2017-11-21 22:45 ` Stefan Beller
2017-11-21 22:47 ` Jonathan Nieder
2017-11-21 23:00 ` Stefan Beller
2017-11-22 0:54 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8tjdcyf1.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).