From 562bc080934b1bd16099723e80cc82a0dc6356b7 Mon Sep 17 00:00:00 2001 From: Max Kirillov Date: Mon, 30 Mar 2015 23:47:47 +0300 Subject: prune --worktrees: fix expire vs worktree existence condition `git prune --worktrees` was pruning worktrees which were non-existent OR expired, while it rather should prune those which are orphaned AND expired, as git-checkout documentation describes. Fix it. Add test 'not prune proper checkouts', which uses valid but expired worktree. Modify test 'not prune recent checkouts' to remove the worktree before pruning - link in worktrees still must survive. In older form it is useless because would pass always when the other test passes. Signed-off-by: Max Kirillov Acked-by: Duy Nguyen Signed-off-by: Junio C Hamano --- t/t2026-prune-linked-checkouts.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 't/t2026-prune-linked-checkouts.sh') diff --git a/t/t2026-prune-linked-checkouts.sh b/t/t2026-prune-linked-checkouts.sh index e885bafc97..1821a480c5 100755 --- a/t/t2026-prune-linked-checkouts.sh +++ b/t/t2026-prune-linked-checkouts.sh @@ -4,6 +4,10 @@ test_description='prune $GIT_DIR/worktrees' . ./test-lib.sh +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 @@ -77,8 +81,16 @@ test_expect_success 'not prune recent checkouts' ' mkdir zz && mkdir -p .git/worktrees/jlm && echo "$(pwd)"/zz >.git/worktrees/jlm/gitdir && + rmdir zz && git prune --worktrees --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 && + test -d .git/worktrees/nop +' + test_done -- cgit v1.2.3