diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2015-01-03 16:41:26 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-01-07 10:23:08 -0800 |
| commit | 1d0fa898eaa879d2fa4785164c3261dd40fe5f89 (patch) | |
| tree | 9ca36b9782124675bd472dc32f93cc4765092263 /t | |
| parent | checkout: pass whole struct to parse_branchname_arg instead of individual flags (diff) | |
| download | tgif-1d0fa898eaa879d2fa4785164c3261dd40fe5f89.tar.xz | |
checkout: add --ignore-other-wortrees
Noticed-by: Mark Levedahl <mlevedahl@gmail.com>
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-checkout-to.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t2025-checkout-to.sh b/t/t2025-checkout-to.sh index 915b506b6c..f8e4df4818 100755 --- a/t/t2025-checkout-to.sh +++ b/t/t2025-checkout-to.sh @@ -79,6 +79,13 @@ test_expect_success 'die the same branch is already checked out' ' ) ' +test_expect_success 'not die the same branch is already checked out' ' + ( + cd here && + git checkout --ignore-other-worktrees --to anothernewmaster newmaster + ) +' + test_expect_success 'not die on re-checking out current branch' ' ( cd there && |