Git development
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jasper Mayone <me@jaspermayone.com>
Cc: git@vger.kernel.org,  phillip.wood123@gmail.com,
	sunshine@sunshineco.com,  kristofferhaugsbakk@fastmail.com,
	ben.knoble@gmail.com,  haraldnordgren@gmail.com
Subject: Re: [PATCH v5 5/5] branch: do not mark the branch the current worktree is rebasing
Date: Fri, 13 Nov 2026 10:59:01 -0800	[thread overview]
Message-ID: <xmqq8q2wd0cq.fsf@gitster.g> (raw)
In-Reply-To: <20261111152811.99986-6-me@jaspermayone.com> (Jasper Mayone's message of "Wed, 11 Nov 2026 10:28:10 -0500")

Jasper Mayone <me@jaspermayone.com> writes:

> Since "ref-filter: name the worktree of a branch being rebased or
> bisected", "git branch" marks a branch with "+" when a worktree is

It cannot be avoided but it is awkward that we have to refer to a
commit without a carved-into-stone object name yet.  I wonder if

    Since "ref-filter: name ..." that is a few commits ago in this
    series, ...

or something along that line would help?

> rebasing or bisecting it. In that worktree itself, the list already
> starts with "* (no branch, rebasing topic)", so a "+ topic" line
> below it shows the same branch twice.

Two comments.

 - in what context the command "marks a branch" is unclear.  Are you
   talking about "git branch --list" output?

 - does this talk about a regression in the middle of a series?  Can
   we avoid such a regression by reordering commits in some way?

I seem to have ~600-700 local branches in the repository I usually
work in (with a handful of worktrees), and I do see the list starts
with

  * (no branch, bisect started on jm/worktree-rebase-bisect-checked-out)
  ab/describe-no-i18n-of-debug-messages
  ab/index-pack-retain-child-bases
  ...

but by the time I scroll down to see the branches around it, I suspect

  ...
  jk/test-lazy-prereq-heredoc
  jk/unit-tests-via-test-lib
  jk/xdiff-size_t
  jm/t0213-skip-emulated-ancestry-tests
  jm/worktree-rebase-bisect-checked-out
  jr/bisect-custom-terms-in-output
  js/adjust-tests-to-explicitly-access-bare-repo
  ...

that I would appreciate the branch currently being bisected marked
as such in the list, together with any other branches being bisected
in other worktrees.

So, unless I am missing a use case this change is trying to cater
to, I am a bit negative on this change.  If the [4/5] were solely to
support this step, then stopping the series at [3/5] might be
sufficient.

Thanks.

  reply	other threads:[~2026-11-13 18:59 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-21 17:33 [RFC PATCH 0/1] worktree list: add --merged and --no-merged Jasper Mayone
2026-10-21 17:33 ` [RFC PATCH 1/1] " Jasper Mayone
2026-10-23 18:30   ` Junio C Hamano
2026-10-24  6:25     ` Eric Sunshine
2026-10-24 16:53       ` [PATCH v2] worktree list: add --branch to select worktrees by branch Jasper Mayone
2026-10-25 14:47         ` Phillip Wood
2026-10-26 11:02           ` Phillip Wood
2026-10-28  6:02           ` Eric Sunshine
2026-10-28 15:27             ` Junio C Hamano
2026-10-28 11:32         ` Kristoffer Haugsbakk
2026-10-29  4:46           ` Jasper Mayone
2026-10-29  5:01             ` Eric Sunshine
2026-10-29 11:14             ` Phillip Wood
2026-10-29 14:23               ` Ben Knoble
2026-10-29 16:10                 ` Phillip Wood
2026-10-30 14:21         ` [PATCH 0/2] worktree: treat a branch being rebased or bisected as checked out Jasper Mayone
2026-10-30 14:21           ` [PATCH 1/2] worktree remove: refuse a worktree in the middle of a rebase or bisect Jasper Mayone
2026-11-02 14:07             ` Phillip Wood
2026-11-02 17:57               ` Jasper Mayone
2026-10-30 14:21           ` [PATCH 2/2] ref-filter: name the worktree of a branch being rebased or bisected Jasper Mayone
2026-11-02 14:06             ` Phillip Wood
2026-11-02 17:57               ` Jasper Mayone
2026-10-30 22:55           ` [PATCH 0/2] worktree: treat a branch being rebased or bisected as checked out Junio C Hamano
2026-10-30 23:06             ` Jasper Mayone
2026-11-02 18:29           ` [PATCH v4 0/4] " Jasper Mayone
2026-11-02 18:29             ` [PATCH v4 1/4] worktree remove: refuse a worktree in the middle of an operation Jasper Mayone
2026-11-10 16:47               ` Phillip Wood
2026-11-10 17:09                 ` Ben Knoble
2026-11-02 18:29             ` [PATCH v4 2/4] doc: for-each-ref: say how to read %(worktreepath) safely Jasper Mayone
2026-11-09 12:36               ` D. Ben Knoble
2026-11-09 15:10                 ` Phillip Wood
2026-11-09 17:27                   ` Ben Knoble
2026-11-09 20:17                     ` Junio C Hamano
2026-11-10 16:47               ` Phillip Wood
2026-11-02 18:29             ` [PATCH v4 3/4] ref-filter: name the worktree of a branch being rebased or bisected Jasper Mayone
2026-11-10 16:47               ` Phillip Wood
2026-11-02 18:29             ` [PATCH v4 4/4] branch: do not mark the branch the current worktree is rebasing Jasper Mayone
2026-11-10 16:45               ` Phillip Wood
2026-11-10 16:49             ` [PATCH v4 0/4] worktree: treat a branch being rebased or bisected as checked out Phillip Wood
2026-11-11 15:28             ` [PATCH v5 0/5] " Jasper Mayone
2026-11-11 15:28               ` [PATCH v5 1/5] worktree remove: refuse a worktree in the middle of an operation Jasper Mayone
2026-11-11 15:28               ` [PATCH v5 2/5] doc: for-each-ref: say how to read %(worktreepath) safely Jasper Mayone
2026-11-11 15:28               ` [PATCH v5 3/5] ref-filter: name the worktree of a branch being rebased or bisected Jasper Mayone
2026-11-13 18:59                 ` Junio C Hamano
2026-11-11 15:28               ` [PATCH v5 4/5] ref-filter: add %(currentworktree) Jasper Mayone
2026-11-13 18:59                 ` Junio C Hamano
2026-11-11 15:28               ` [PATCH v5 5/5] branch: do not mark the branch the current worktree is rebasing Jasper Mayone
2026-11-13 18:59                 ` Junio C Hamano [this message]
2026-11-11 15:42               ` [PATCH v5 0/5] worktree: treat a branch being rebased or bisected as checked out Ben Knoble
2026-10-21 21:36 ` [RFC PATCH 0/1] worktree list: add --merged and --no-merged Harald Nordgren
2026-10-21 22:12   ` Junio C Hamano
2026-10-22  7:21     ` Harald Nordgren
2026-10-22 17:58   ` Kristoffer Haugsbakk

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=xmqq8q2wd0cq.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=ben.knoble@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=haraldnordgren@gmail.com \
    --cc=kristofferhaugsbakk@fastmail.com \
    --cc=me@jaspermayone.com \
    --cc=phillip.wood123@gmail.com \
    --cc=sunshine@sunshineco.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