From ba128e23757bb2ee2c164f1d7eab4258ff8f1d99 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 6 Oct 2015 12:12:21 +0200 Subject: t2026: rename worktree prune test Linked checkouts are known under the name worktree, now. Rename the test accordingly. Specifically, this avoids the confusion that t2026 is actually not about pruning in or with linked checkouts aka worktress but about pruning worktrees, i.e. about "git worktree prune" rather than "git prune". Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- t/t2026-prune-linked-checkouts.sh | 96 --------------------------------------- t/t2026-worktree-prune.sh | 96 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+), 96 deletions(-) delete mode 100755 t/t2026-prune-linked-checkouts.sh create mode 100755 t/t2026-worktree-prune.sh (limited to 't') diff --git a/t/t2026-prune-linked-checkouts.sh b/t/t2026-prune-linked-checkouts.sh deleted file mode 100755 index a0f1e3bb80..0000000000 --- a/t/t2026-prune-linked-checkouts.sh +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -test_description='prune $GIT_DIR/worktrees' - -. ./test-lib.sh - -test_expect_success initialize ' - git commit --allow-empty -m init -' - -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 worktree prune --verbose >actual && - cat >expect <.git/worktrees/def/def && - cat >expect <actual && - test_i18ncmp expect actual && - ! test -d .git/worktrees/def && - ! test -d .git/worktrees -' - -test_expect_success SANITY 'prune directories with unreadable gitdir' ' - mkdir -p .git/worktrees/def/abc && - : >.git/worktrees/def/def && - : >.git/worktrees/def/gitdir && - chmod u-r .git/worktrees/def/gitdir && - 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 -' - -test_expect_success 'prune directories with invalid gitdir' ' - mkdir -p .git/worktrees/def/abc && - : >.git/worktrees/def/def && - : >.git/worktrees/def/gitdir && - git worktree prune --verbose >actual && - test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual && - ! test -d .git/worktrees/def && - ! test -d .git/worktrees -' - -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 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 -' - -test_expect_success 'not prune locked checkout' ' - test_when_finished rm -r .git/worktrees && - mkdir -p .git/worktrees/ghi && - : >.git/worktrees/ghi/locked && - git worktree prune && - test -d .git/worktrees/ghi -' - -test_expect_success 'not prune recent checkouts' ' - test_when_finished rm -r .git/worktrees && - mkdir zz && - mkdir -p .git/worktrees/jlm && - echo "$(pwd)"/zz >.git/worktrees/jlm/gitdir && - rmdir zz && - 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 worktree add --detach "$PWD/nop" master && - git worktree prune && - test -d .git/worktrees/nop -' - -test_done diff --git a/t/t2026-worktree-prune.sh b/t/t2026-worktree-prune.sh new file mode 100755 index 0000000000..a0f1e3bb80 --- /dev/null +++ b/t/t2026-worktree-prune.sh @@ -0,0 +1,96 @@ +#!/bin/sh + +test_description='prune $GIT_DIR/worktrees' + +. ./test-lib.sh + +test_expect_success initialize ' + git commit --allow-empty -m init +' + +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 worktree prune --verbose >actual && + cat >expect <.git/worktrees/def/def && + cat >expect <actual && + test_i18ncmp expect actual && + ! test -d .git/worktrees/def && + ! test -d .git/worktrees +' + +test_expect_success SANITY 'prune directories with unreadable gitdir' ' + mkdir -p .git/worktrees/def/abc && + : >.git/worktrees/def/def && + : >.git/worktrees/def/gitdir && + chmod u-r .git/worktrees/def/gitdir && + 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 +' + +test_expect_success 'prune directories with invalid gitdir' ' + mkdir -p .git/worktrees/def/abc && + : >.git/worktrees/def/def && + : >.git/worktrees/def/gitdir && + git worktree prune --verbose >actual && + test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual && + ! test -d .git/worktrees/def && + ! test -d .git/worktrees +' + +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 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 +' + +test_expect_success 'not prune locked checkout' ' + test_when_finished rm -r .git/worktrees && + mkdir -p .git/worktrees/ghi && + : >.git/worktrees/ghi/locked && + git worktree prune && + test -d .git/worktrees/ghi +' + +test_expect_success 'not prune recent checkouts' ' + test_when_finished rm -r .git/worktrees && + mkdir zz && + mkdir -p .git/worktrees/jlm && + echo "$(pwd)"/zz >.git/worktrees/jlm/gitdir && + rmdir zz && + 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 worktree add --detach "$PWD/nop" master && + git worktree prune && + test -d .git/worktrees/nop +' + +test_done -- cgit v1.2.3