git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "Rubén Justo" <rjusto@gmail.com>
Cc: Git List <git@vger.kernel.org>
Subject: Re: [PATCH] status: fix branch shown when not only bisecting
Date: Tue, 01 Aug 2023 13:45:16 -0700	[thread overview]
Message-ID: <xmqqtttia3vn.fsf@gitster.g> (raw)
In-Reply-To: <32997081-62d8-b900-d58a-308e5c773818@gmail.com> ("Rubén Justo"'s message of "Tue, 1 Aug 2023 22:39:08 +0200")

Rubén Justo <rjusto@gmail.com> writes:

>> When a sequencer is
>> driving a cherry-pick of master..topic1 and the user gets control
>> back in the middle, perhaps due to a conflict, should the user be
>> allowed to do "cherry-pick master..topic2", splicing these commits
>> from the other topic in the middle of the first cherry-pick session
>> the user started?
>
> We already prevent this to happen.  Maybe because we do not want to
> support multiple .git/CHERRY_PICK_HEAD files.  Anyway, to me, sounds
> like a reasonable thing to have: that nesting limit of 1.  The same for
> the other operations.

OK, as long as we prevent such kinds of questionable combinations
("two multi-commit cherry-picks" was merely an example---I did not
mean that is the only problematic case), I do not see much problem
with it.  In any case, teaching "status" how to show such a state
with less information loss, which is the theme of this patch, is not
making things worse---even if some of the states may be nonsense and
should be prevented, "git status" is not the place to do so anyway.

I didn't see if the proposed output from the command makes sense
(yet), but somebody else may already have done so and writing their
reviews on their findings.  Let's see if we get any positive reviews
and move it to 'next' after that.

Will queue in the meantime not to lose it in 'seen'.

Thanks.

  reply	other threads:[~2023-08-01 20:45 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-30  1:07 [PATCH] status: fix branch shown when not only bisecting Rubén Justo
2023-07-31 23:45 ` Junio C Hamano
2023-08-01 20:39   ` Rubén Justo
2023-08-01 20:45     ` Junio C Hamano [this message]
2023-08-16  4:24       ` Junio C Hamano
2023-09-09 20:12 ` [PATCH v2] " Rubén Justo
2023-10-16 22:08   ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqtttia3vn.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=rjusto@gmail.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.
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 NNTP newsgroup(s).