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: Mon, 31 Jul 2023 16:45:56 -0700 [thread overview]
Message-ID: <xmqqedkn3arv.fsf@gitster.g> (raw)
In-Reply-To: <48745298-f12b-8efb-4e48-90d2c22a8349@gmail.com> ("Rubén Justo"'s message of "Sun, 30 Jul 2023 03:07:42 +0200")
Rubén Justo <rjusto@gmail.com> writes:
> In 83c750acde (wt-status.*: better advice for git status added,
> 2012-06-05), git-status received new informative messages to describe
> the ongoing work in a worktree.
>
> Multiple operations can be performed concurrently in a worktree. For
> example, during a rebase, the user can also perform a cherry-pick.
Hmph ...
> In
> that situation, git-status only shows information about one of them,
> prioritizing which one, in order: merge, am, rebase, cherry-pick.
... I have to wonder if it is a bug that "cherry-pick" proceeds when
there is an ongoing "rebase" going on, though. 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?
next prev parent reply other threads:[~2023-07-31 23:46 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 [this message]
2023-08-01 20:39 ` Rubén Justo
2023-08-01 20:45 ` Junio C Hamano
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=xmqqedkn3arv.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.