From: Gabriel Scherer <gabriel.scherer@inria•fr>
To: Ben Knoble <ben.knoble@gmail•com>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>,
Phillip Wood <phillip.wood@dunelm•org.uk>
Subject: Re: [PATCH 0/3] extend --ignore-other-worktrees to 'rebase', add hints
Date: Sat, 13 Sep 2025 22:02:32 +0200 [thread overview]
Message-ID: <a8874cde-cd00-41b0-ba41-ab2fd52ce45d@inria.fr> (raw)
In-Reply-To: <F7295141-49F5-4013-911A-7730C130F8CC@gmail.com>
Thanks for looking!
On 13/09/2025 21:30, Ben Knoble wrote:
> I’m eager to see further reviews, but nothing I saw in this series stuck out as a major problem. I saw we updated the rebase test cases; should we add some more for checkout or worktree?
There is already a check of the --ignore-other-worktrees option for
'checkout' in t/t2060-switch.sh. The test only records success or
failure, not hints; but I checked manually that the hints are shown as
expected.
There are code paths in 'worktree add' that call the same
die_if_checked_out function, but I did not touch those. They seem to
support the --force option to disable the check, and we could also have
a hint to make this self-discoverable. (One could suggest also having a
--ignore-other-worktrees option in 'worktree' for consistency, but
unlike 'checkout' the --force option currently has no additional effect
than ignoring other worktrees.) Please let me know if you think that
some changes to worktree.c should be included in the present patchset
for consistency.
next prev parent reply other threads:[~2025-09-13 20:02 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-13 14:13 [PATCH 0/3] extend --ignore-other-worktrees to 'rebase', add hints Gabriel Scherer
2025-09-13 14:13 ` [PATCH 1/3] checkout: provide hint when failing due to another worktree Gabriel Scherer
2025-09-13 20:55 ` Kristoffer Haugsbakk
2025-09-14 7:50 ` Gabriel Scherer
2025-09-15 8:53 ` Junio C Hamano
2025-09-15 19:52 ` Gabriel Scherer
2025-09-16 5:32 ` Junio C Hamano
2025-09-17 14:17 ` Junio C Hamano
2025-09-17 15:25 ` Gabriel Scherer
2025-09-19 14:13 ` Phillip Wood
2025-09-14 19:03 ` Ben Knoble
2025-09-14 19:06 ` Ben Knoble
2025-09-14 19:32 ` Kristoffer Haugsbakk
2025-09-13 14:13 ` [PATCH 2/3] rebase: support --ignore-other-worktrees Gabriel Scherer
2025-09-15 10:09 ` Phillip Wood
2025-09-15 16:23 ` Junio C Hamano
2025-09-13 14:13 ` [PATCH 3/3] rebase: hint when failing on branch used by another worktree Gabriel Scherer
2025-09-13 19:30 ` [PATCH 0/3] extend --ignore-other-worktrees to 'rebase', add hints Ben Knoble
2025-09-13 20:02 ` Gabriel Scherer [this message]
2025-09-15 10:09 ` Phillip Wood
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=a8874cde-cd00-41b0-ba41-ab2fd52ce45d@inria.fr \
--to=gabriel.scherer@inria$(echo .)fr \
--cc=ben.knoble@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=phillip.wood@dunelm$(echo .)org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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