]> git.ipfire.org Git - thirdparty/git.git/commit
bisect: fix "reset" when branch is checked out elsewhere
authorRubén Justo <rjusto@gmail.com>
Sun, 22 Jan 2023 01:38:10 +0000 (02:38 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 22 Jan 2023 17:23:11 +0000 (09:23 -0800)
commit7fb89047cc3957bf829233786c00edd5d87f0225
tree7e74d9e7c68e3511fc939f6750d982c39d06a601
parent56c8fb1e95377900ec9d53c07886022af0a5d3c2
bisect: fix "reset" when branch is checked out elsewhere

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 <rjusto@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/bisect.c
t/t6030-bisect-porcelain.sh