From: Junio C Hamano <gitster@pobox.com>
To: "Rubén Justo" <rjusto@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH] bisect: fix "reset" when branch is checked out elsewhere
Date: Mon, 06 Feb 2023 11:04:58 -0800 [thread overview]
Message-ID: <xmqqwn4u7gyt.fsf@gitster.g> (raw)
In-Reply-To: <a66218a3-919d-eca2-1859-41ac02aa38e7@gmail.com> ("Rubén Justo"'s message of "Sat, 4 Feb 2023 23:46:47 +0100")
Rubén Justo <rjusto@gmail.com> writes:
> The devil is in the details: "git branch -m", "git branch -d".
>
> We're not ready to have BISECT_START pointing to a deleted branch, or
> renaming a branch pointed by it.
It indicates that the callers of find_shared_symref() to see if "is
this branch being actively used by checked out, bisected, or
rebased, and I shouldn't touch it?" need to know more than what
find_shared_symref() interface gives them---namely, "can I repoint
it to a different commit?" and "can I make it disappear?" are
different conditions they need to be able to learn.
Until that distinction becomes expressible, I am actually OK with
forbidding both operations, i.e. while a branch is being bisected
elsewhere, we should be able to update its tip to point at a
different commit, but it is OK to forbid that because we cannot
allow the branch be renamed away or removed.
Thanks.
next prev parent reply other threads:[~2023-02-06 19:05 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-22 1:38 [PATCH] bisect: fix "reset" when branch is checked out elsewhere Rubén Justo
2023-01-23 2:01 ` Junio C Hamano
2023-01-26 2:18 ` Rubén Justo
2023-01-26 17:06 ` Junio C Hamano
2023-01-26 17:13 ` Junio C Hamano
2023-02-04 22:46 ` Rubén Justo
2023-02-06 19:04 ` Junio C Hamano [this message]
2023-02-04 22:57 ` [PATCH v2] " Rubén Justo
2023-02-06 22:29 ` Junio C Hamano
2023-02-08 0:30 ` Rubén Justo
2023-02-08 5:16 ` Junio C Hamano
2023-02-08 21:54 ` Rubén Justo
2023-02-15 4:52 ` Eric Sunshine
2023-02-15 22:20 ` Rubén Justo
2023-02-20 22:53 ` [PATCH v3] " Rubén Justo
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=xmqqwn4u7gyt.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=phillip.wood@dunelm.org.uk \
--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.
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).