t2407: test branches currently using apply backend
The tests in t2407 that verify the branch_checked_out() helper in the case of bisects and rebases were added by 9347303db89 (branch: check for bisects and rebases, 2022-06-08). However, that commit failed to check for rebases that are using the 'apply' backend. Add a test that checks the apply backend. The implementation was already correct here, but it is good to have regression tests before modifying the implementation further. Signed-off-by: Derrick Stolee <derrickstolee@github.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Derrick Stolee committed
Jul 19, 2022 at 18:33 UTC
18ea59582778bd0b80fc643bc4e2981275d2300d
1 file changed
+11
-1
t/t2407-worktree-heads.sh
+11
-1
@@ -61,7 +61,17 @@ test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in bisect' '
61
grep "cannot force update the branch '\''wt-4'\'' checked out at.*wt-4" err
62
'
63
64
-test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase' '
64
+test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (apply)' '
65
+ test_when_finished git -C wt-2 rebase --abort &&
66
+
67
+ # This will fail part-way through due to a conflict.
68
+ test_must_fail git -C wt-2 rebase --apply conflict-2 &&
69
+
70
+ test_must_fail git branch -f wt-2 HEAD 2>err &&
71
+ grep "cannot force update the branch '\''wt-2'\'' checked out at.*wt-2" err
72
+'
73
+
74
+test_expect_success !SANITIZE_LEAK 'refuse to overwrite: worktree in rebase (merge)' '
75
test_when_finished git -C wt-2 rebase --abort &&
76
77
# This will fail part-way through due to a conflict.