Re: [PATCH 2/4] branch: check for bisects and rebases
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 8, 2022, 22:03 UTC
- Message-ID
- <xmqqsfoeq0co.fsf@gitster.g>
- In-Reply-To
- <18bad9b0c496fc0ceab1e567aee83f2160ae5d75.1654718942.git.gitgitgadget@gmail.com>
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 38 quoted lines
> diff --git a/t/t2407-worktree-heads.sh b/t/t2407-worktree-heads.sh > index dd905dc1a5c..12faca7f655 100755 > --- a/t/t2407-worktree-heads.sh > +++ b/t/t2407-worktree-heads.sh > @@ -21,4 +21,33 @@ test_expect_success 'refuse to overwrite: checked out in worktree' ' > done > ' > > +test_expect_success 'refuse to overwrite: worktree in bisect' ' > + test_when_finished test_might_fail git -C wt-4 bisect reset && > + > + ( > + git -C wt-4 bisect start && > + git -C wt-4 bisect bad HEAD && > + git -C wt-4 bisect good HEAD~3 > + ) && > + > + test_must_fail git branch -f wt-4 HEAD 2>err && > + grep "cannot force update the branch '\''wt-4'\'' checked out at" err > +' > + > +. "$TEST_DIRECTORY"/lib-rebase.sh > + > +test_expect_success 'refuse to overwrite: worktree in rebase' ' > + test_when_finished test_might_fail git -C wt-4 rebase --abort && > + > + ( > + set_fake_editor && > + FAKE_LINES="edit 1 2 3" \ > + git -C wt-4 rebase -i HEAD~3 >rebase && > + git -C wt-4 status > + ) && > + > + test_must_fail git branch -f wt-4 HEAD 2>err && > + grep "cannot force update the branch '\''wt-4'\'' checked out at" err > +' > + > test_done
Nice to see that each additional feature corresponds to each additional test.
Thanks.