diff options
| author | Max Kirillov <max@max630.net> | 2015-03-30 23:47:47 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-31 11:02:11 -0700 |
| commit | 562bc080934b1bd16099723e80cc82a0dc6356b7 (patch) | |
| tree | 8ba6b41358d89bf301ad9c6782088be7a0440024 | |
| parent | 466e8d5d660ba732c1065ab3329c91e4b4aa7739 (diff) | |
| download | git-562bc080934b1bd16099723e80cc82a0dc6356b7.tar.gz | |
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 <max@max630.net>
Acked-by: Duy Nguyen <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/prune.c | 10 | ||||
| -rwxr-xr-x | t/t2026-prune-linked-checkouts.sh | 12 |
2 files changed, 19 insertions, 3 deletions
diff --git a/builtin/prune.c b/builtin/prune.c index f08670a984..86282b2447 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -120,11 +120,15 @@ static int prune_worktree(const char *id, struct strbuf *reason) if (!stat(git_path("worktrees/%s/link", id), &st_link) && st_link.st_nlink > 1) return 0; - strbuf_addf(reason, _("Removing worktrees/%s: gitdir file points to non-existent location"), id); - return 1; + if (st.st_mtime <= expire) { + strbuf_addf(reason, _("Removing worktrees/%s: gitdir file points to non-existent location"), id); + return 1; + } else { + return 0; + } } free(path); - return st.st_mtime <= expire; + return 0; } static void prune_worktrees(void) 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 |