Merge branch 'maint'

diff --git a/t/t2025-checkout-to.sh b/t/t2025-checkout-to.sh
index eddd3251f1faede8cbfb0c9f6db501f0facfe063..f8e4df4818523de74ff7330f015415bfb9cc8227 100755 (executable)
--- a/t/t2025-checkout-to.sh
+++ b/t/t2025-checkout-to.sh
@@ -13,10 +13,15 @@ test_expect_success 'checkout --to not updating paths' '
 '
 
 test_expect_success 'checkout --to an existing worktree' '
-       mkdir existing &&
+       mkdir -p existing/subtree &&
        test_must_fail git checkout --detach --to existing master
 '
 
+test_expect_success 'checkout --to an existing empty worktree' '
+       mkdir existing_empty &&
+       git checkout --detach --to existing_empty master
+'
+
 test_expect_success 'checkout --to refuses to checkout locked branch' '
        test_must_fail git checkout --to zere master &&
        ! test -d zere &&
@@ -74,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 &&