diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2016-02-15 20:35:33 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-15 15:54:13 -0800 |
| commit | beb6f24beef67f6f825c8c99e408f67d23b784d4 (patch) | |
| tree | 943606669576499fc5e0fd4a3f1c05b7bc50c75f /t | |
| parent | 0ebf4a2af3b72847327e977c5710fd123926570e (diff) | |
| download | git-beb6f24beef67f6f825c8c99e408f67d23b784d4.tar.gz git-beb6f24beef67f6f825c8c99e408f67d23b784d4.tar.xz | |
worktree add -B: do the checkout test before update branch
If --force is not given but -B is, we should not proceed if the given
branch is already checked out elsewhere. add_worktree() has this test,
but it kicks in too late when "git branch --force" is already
executed. As a result, even though we correctly refuse to create a new
worktree, we have already updated the branch and mess up the other
checkout.
Repeat the die_if_checked_out() test again for this specific case before
"git branch" runs.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2025-worktree-add.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh index a4d36c089..cbfa41ec6 100755 --- a/t/t2025-worktree-add.sh +++ b/t/t2025-worktree-add.sh @@ -193,6 +193,13 @@ test_expect_success '"add" -B/--detach mutually exclusive' ' test_must_fail git worktree add -B poodle --detach bamboo master ' +test_expect_success '"add -B" fails if the branch is checked out' ' + git rev-parse newmaster >before && + test_must_fail git worktree add -B newmaster bamboo master && + git rev-parse newmaster >after && + test_cmp before after +' + test_expect_success 'add -B' ' git worktree add -B poodle bamboo2 master^ && git -C bamboo2 symbolic-ref HEAD >actual && |