Merge branch 'sg/wt-status-header-inclusion'

diff --git a/t/t2026-prune-linked-checkouts.sh b/t/t2026-prune-linked-checkouts.sh
index 1821a480c5ce6fd31416201e3a3dcb0f17b1de91..a0f1e3bb800ec6943648eeffb9e7ca84e328fa41 100755 (executable)
--- a/t/t2026-prune-linked-checkouts.sh
+++ b/t/t2026-prune-linked-checkouts.sh
@@ -8,15 +8,15 @@ test_expect_success initialize '
        git commit --allow-empty -m init
 '
 
-test_expect_success 'prune --worktrees on normal repo' '
-       git prune --worktrees &&
-       test_must_fail git prune --worktrees abc
+test_expect_success 'worktree prune on normal repo' '
+       git worktree prune &&
+       test_must_fail git worktree prune abc
 '
 
 test_expect_success 'prune files inside $GIT_DIR/worktrees' '
        mkdir .git/worktrees &&
        : >.git/worktrees/abc &&
-       git prune --worktrees --verbose >actual &&
+       git worktree prune --verbose >actual &&
        cat >expect <<EOF &&
 Removing worktrees/abc: not a valid directory
 EOF
@@ -31,7 +31,7 @@ test_expect_success 'prune directories without gitdir' '
        cat >expect <<EOF &&
 Removing worktrees/def: gitdir file does not exist
 EOF
-       git prune --worktrees --verbose >actual &&
+       git worktree prune --verbose >actual &&
        test_i18ncmp expect actual &&
        ! test -d .git/worktrees/def &&
        ! test -d .git/worktrees
@@ -42,7 +42,7 @@ test_expect_success SANITY 'prune directories with unreadable gitdir' '
        : >.git/worktrees/def/def &&
        : >.git/worktrees/def/gitdir &&
        chmod u-r .git/worktrees/def/gitdir &&
-       git prune --worktrees --verbose >actual &&
+       git worktree prune --verbose >actual &&
        test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual &&
        ! test -d .git/worktrees/def &&
        ! test -d .git/worktrees
@@ -52,7 +52,7 @@ test_expect_success 'prune directories with invalid gitdir' '
        mkdir -p .git/worktrees/def/abc &&
        : >.git/worktrees/def/def &&
        : >.git/worktrees/def/gitdir &&
-       git prune --worktrees --verbose >actual &&
+       git worktree prune --verbose >actual &&
        test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual &&
        ! test -d .git/worktrees/def &&
        ! test -d .git/worktrees
@@ -62,7 +62,7 @@ test_expect_success 'prune directories with gitdir pointing to nowhere' '
        mkdir -p .git/worktrees/def/abc &&
        : >.git/worktrees/def/def &&
        echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
-       git prune --worktrees --verbose >actual &&
+       git worktree prune --verbose >actual &&
        test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
        ! test -d .git/worktrees/def &&
        ! test -d .git/worktrees
@@ -72,7 +72,7 @@ test_expect_success 'not prune locked checkout' '
        test_when_finished rm -r .git/worktrees &&
        mkdir -p .git/worktrees/ghi &&
        : >.git/worktrees/ghi/locked &&
-       git prune --worktrees &&
+       git worktree prune &&
        test -d .git/worktrees/ghi
 '
 
@@ -82,14 +82,14 @@ test_expect_success 'not prune recent checkouts' '
        mkdir -p .git/worktrees/jlm &&
        echo "$(pwd)"/zz >.git/worktrees/jlm/gitdir &&
        rmdir zz &&
-       git prune --worktrees --verbose --expire=2.days.ago &&
+       git worktree prune --verbose --expire=2.days.ago &&
        test -d .git/worktrees/jlm
 '
 
 test_expect_success 'not prune proper checkouts' '
        test_when_finished rm -r .git/worktrees &&
-       git checkout "--to=$PWD/nop" --detach master &&
-       git prune --worktrees &&
+       git worktree add --detach "$PWD/nop" master &&
+       git worktree prune &&
        test -d .git/worktrees/nop
 '