Re: [PATCH v2] bisect: fix "reset" when branch is checked out elsewhere
From: Eric Sunshine <hidden>
Date: 2023-02-15 04:52:23
On Sat, Feb 4, 2023 at 6:02 PM Rubén Justo [off-list ref] wrote:
quoted hunk ↗ jump to hunk
Since 1d0fa89 (checkout: add --ignore-other-wortrees, 2015-01-03) we have a safety valve in checkout/switch to prevent the same branch from being checked out simultaneously in multiple worktrees. If a branch is bisected in a worktree while also being checked out in another worktree; when the bisection is finished, checking out the branch back in the current worktree may fail. Let's teach bisect to use the "--ignore-other-worktrees" flag. Signed-off-by: Rubén Justo <redacted> ---diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh@@ -122,6 +122,29 @@ test_expect_success 'bisect start without -- takes unknown arg as pathspec' ' +test_expect_success 'bisect reset: back in a branch checked out also elsewhere' ' + echo "shared" > branch.expect && + test_bisect_reset() { + git -C $1 bisect start && + git -C $1 bisect good $HASH1 && + git -C $1 bisect bad $HASH3 && + git -C $1 bisect reset && + git -C $1 branch --show-current > branch.output && + cmp branch.expect branch.output + } && + test_when_finished " + git worktree remove wt1 && + git worktree remove wt2 && + git branch -d shared + " &&
As mentioned in my review[1] of one of your other patches, &&-chaining within the argument to test_when_finished() is probably undesirable in this case since failure of any cleanup command would cause test_when_finish() to fail, which would cause the test to fail overall. [1]: https://lore.kernel.org/git/CAPig+cQpizjmhmDKb=HPrcYqqRq7JpvC-NZvY7B9eBbG+NrfKw@mail.gmail.com/ (local)
+ 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_bisect_reset wt1 && + test_bisect_reset wt2 +'