From: "Rubén Justo" <rjusto@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
Phillip Wood <phillip.wood123@gmail.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: [PATCH v4 2/4] branch: fix die_if_checked_out() when ignore_current_worktree
Date: Sat, 25 Feb 2023 15:22:02 +0100 [thread overview]
Message-ID: <356b96bf-4130-6a91-4ce5-4228b071e183@gmail.com> (raw)
In-Reply-To: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
In 8d9fdd7 (worktree.c: check whether branch is rebased in another
worktree, 2016-04-22) die_if_checked_out() learned a new option
ignore_current_worktree, to modify the operation from "die() if the
branch is checked out in any worktree" to "die() if the branch is
checked out in any worktree other than the current one".
Unfortunately we implemented it by checking the flag is_current in the
worktree that find_shared_symref() returns.
When the same branch is checked out in several worktrees simultaneously,
find_shared_symref() will return the first matching worktree in the list
composed by get_worktrees(). If one of the worktrees with the checked
out branch is the current worktree, find_shared_symref() may or may not
return it, depending on the order in the list.
Instead of find_shared_symref(), let's do the search using use the
recently introduced API is_shared_symref(), and consider
ignore_current_worktree when necessary.
Signed-off-by: Rubén Justo <rjusto@gmail.com>
---
branch.c | 14 +++++++++-----
worktree.c | 3 +--
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/branch.c b/branch.c
index e5614b53b3..64b7dbfd17 100644
--- a/branch.c
+++ b/branch.c
@@ -820,12 +820,16 @@ void remove_branch_state(struct repository *r, int verbose)
void die_if_checked_out(const char *branch, int ignore_current_worktree)
{
struct worktree **worktrees = get_worktrees();
- const struct worktree *wt;
- wt = find_shared_symref(worktrees, "HEAD", branch);
- if (wt && (!ignore_current_worktree || !wt->is_current)) {
- skip_prefix(branch, "refs/heads/", &branch);
- die(_("'%s' is already checked out at '%s'"), branch, wt->path);
+ for (int i = 0; worktrees[i]; i++) {
+ if (worktrees[i]->is_current && ignore_current_worktree)
+ continue;
+
+ if (is_shared_symref(worktrees[i], "HEAD", branch)) {
+ skip_prefix(branch, "refs/heads/", &branch);
+ die(_("'%s' is already checked out at '%s'"),
+ branch, worktrees[i]->path);
+ }
}
free_worktrees(worktrees);
diff --git a/worktree.c b/worktree.c
index 40cb9874b7..34043d8fe0 100644
--- a/worktree.c
+++ b/worktree.c
@@ -435,10 +435,9 @@ const struct worktree *find_shared_symref(struct worktree **worktrees,
const char *target)
{
- for (int i = 0; worktrees[i]; i++) {
+ for (int i = 0; worktrees[i]; i++)
if (is_shared_symref(worktrees[i], symref, target))
return worktrees[i];
- }
return NULL;
}
--
2.39.2
next prev parent reply other threads:[~2023-02-25 14:22 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-17 0:36 [PATCH] worktree: teach find_shared_symref to ignore current worktree Rubén Justo
2023-01-17 23:27 ` Junio C Hamano
2023-01-18 23:50 ` Rubén Justo
2023-01-19 10:48 ` Phillip Wood
2023-01-19 23:18 ` Rubén Justo
2023-01-22 1:20 ` [PATCH v2 0/3] fix die_if_checked_out() when ignore_current_worktree Rubén Justo
2023-01-22 1:23 ` [PATCH v2 1/3] branch: " Rubén Justo
2023-01-22 1:50 ` Junio C Hamano
2023-01-22 11:51 ` Rubén Justo
2023-01-22 19:58 ` Junio C Hamano
2023-01-22 23:21 ` Rubén Justo
2023-01-24 10:35 ` Phillip Wood
2023-01-26 3:07 ` Rubén Justo
2023-01-22 1:28 ` [PATCH v2 2/3] rebase: refuse to switch to a branch already checked out elsewhere (test) Rubén Justo
2023-01-22 1:28 ` [PATCH v2 3/3] switch: reject if the branch is " Rubén Justo
2023-02-04 23:19 ` [PATCH v3 0/4] fix die_if_checked_out() when ignore_current_worktree Rubén Justo
2023-02-04 23:25 ` [PATCH v3 1/4] worktree: introduce is_shared_symref() Rubén Justo
2023-02-07 10:44 ` Phillip Wood
2023-02-04 23:25 ` [PATCH v3 2/4] branch: fix die_if_checked_out() when ignore_current_worktree Rubén Justo
2023-02-06 16:56 ` Ævar Arnfjörð Bjarmason
2023-02-06 23:09 ` Rubén Justo
2023-02-07 10:50 ` Phillip Wood
2023-02-07 12:58 ` Ævar Arnfjörð Bjarmason
2023-02-04 23:26 ` [PATCH v3 3/4] rebase: refuse to switch to a branch already checked out elsewhere (test) Rubén Justo
2023-02-06 16:59 ` Ævar Arnfjörð Bjarmason
2023-02-06 23:16 ` Rubén Justo
2023-02-07 10:52 ` Phillip Wood
2023-02-08 0:43 ` Rubén Justo
2023-02-08 5:19 ` Junio C Hamano
2023-02-08 22:09 ` Rubén Justo
2023-02-04 23:26 ` [PATCH v3 4/4] switch: reject if the branch is " Rubén Justo
2023-02-15 4:17 ` Eric Sunshine
2023-02-15 22:17 ` Rubén Justo
2023-02-25 14:14 ` [PATCH v4 0/4] fix die_if_checked_out() when ignore_current_worktree Rubén Justo
2023-02-25 14:21 ` [PATCH v4 1/4] worktree: introduce is_shared_symref() Rubén Justo
2023-02-25 14:22 ` Rubén Justo [this message]
2023-02-25 14:22 ` [PATCH v4 3/4] rebase: refuse to switch to a branch already checked out elsewhere (test) Rubén Justo
2023-02-25 14:22 ` [PATCH v4 4/4] switch: reject if the branch is " Rubén Justo
2023-02-25 22:50 ` [PATCH v4 0/4] fix die_if_checked_out() when ignore_current_worktree Junio C Hamano
2023-02-27 0:00 ` 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=356b96bf-4130-6a91-4ce5-4228b071e183@gmail.com \
--to=rjusto@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).