Merge branch 'sb/submodule-recommend-shallowness'

diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index da54327f5da14d4778ad8603a34b22cf96f96e5c..3a22fc55fc324fbfbfdcdf39fb71e829c89729b5 100755 (executable)
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -254,6 +254,10 @@ test_expect_success 'not allow to delete a branch under rebase' '
        )
 '
 
+test_expect_success 'rename a branch under rebase not allowed' '
+       test_must_fail git branch -M under-rebase rebase-with-new-name
+'
+
 test_expect_success 'check out from current worktree branch ok' '
        (
                cd under-rebase &&
@@ -263,4 +267,21 @@ test_expect_success 'check out from current worktree branch ok' '
        )
 '
 
+test_expect_success 'checkout a branch under bisect' '
+       git worktree add under-bisect &&
+       (
+               cd under-bisect &&
+               git bisect start &&
+               git bisect bad &&
+               git bisect good HEAD~2 &&
+               git worktree list | grep "under-bisect.*detached HEAD" &&
+               test_must_fail git worktree add new-bisect under-bisect &&
+               ! test -d new-bisect
+       )
+'
+
+test_expect_success 'rename a branch under bisect not allowed' '
+       test_must_fail git branch -M under-bisect bisect-with-new-name
+'
+
 test_done