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 3/4] rebase: refuse to switch to a branch already checked out elsewhere (test)
Date: Sat, 25 Feb 2023 15:22:13 +0100 [thread overview]
Message-ID: <6ff38da4-4465-5ffb-36ec-d73a09f3c900@gmail.com> (raw)
In-Reply-To: <6fed3b1b-1c4e-9298-19b6-7ad9c04c87dd@gmail.com>
In b5cabb4a9 (rebase: refuse to switch to branch already checked out
elsewhere, 2020-02-23) we add a condition to prevent a rebase operation
involving a switch to a branch that is already checked out in another
worktree.
A bug has recently been fixed that caused this to not work as expected.
Let's add a test to notice if this changes in the future.
Signed-off-by: Rubén Justo <rjusto@gmail.com>
---
t/t3400-rebase.sh | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index d5a8ee39fc..3ce918fdb8 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -388,6 +388,20 @@ test_expect_success 'switch to branch checked out here' '
git rebase main main
'
+test_expect_success 'switch to branch checked out elsewhere fails' '
+ test_when_finished "
+ git worktree remove wt1 &&
+ git worktree remove wt2 &&
+ git branch -d shared
+ " &&
+ git worktree add wt1 -b shared &&
+ git worktree add wt2 -f shared &&
+ # we test in both worktrees to ensure that works
+ # as expected with "first" and "next" worktrees
+ test_must_fail git -C wt1 rebase shared shared &&
+ test_must_fail git -C wt2 rebase shared shared
+'
+
test_expect_success 'switch to branch not checked out' '
git checkout main &&
git branch other &&
--
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 ` [PATCH v4 2/4] branch: fix die_if_checked_out() when ignore_current_worktree Rubén Justo
2023-02-25 14:22 ` Rubén Justo [this message]
2023-02-25 14:22 ` [PATCH v4 4/4] switch: reject if the branch is already checked out elsewhere (test) 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=6ff38da4-4465-5ffb-36ec-d73a09f3c900@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).