diff options
| author | Rubén Justo <rjusto@gmail.com> | 2023-01-22 02:38:10 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-22 09:23:11 -0800 |
| commit | 7fb89047cc3957bf829233786c00edd5d87f0225 (patch) | |
| tree | 7e74d9e7c68e3511fc939f6750d982c39d06a601 /builtin/commit-tree.c | |
| parent | The ninth batch (diff) | |
| download | git-7fb89047cc3957bf829233786c00edd5d87f0225.tar.gz git-7fb89047cc3957bf829233786c00edd5d87f0225.zip | |
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>
Diffstat (limited to 'builtin/commit-tree.c')
0 files changed, 0 insertions, 0 deletions