summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorMax Kirillov <max@max630.net>2015-03-30 20:47:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-31 18:02:11 (GMT)
commit562bc080934b1bd16099723e80cc82a0dc6356b7 (patch)
tree8ba6b41358d89bf301ad9c6782088be7a0440024 /builtin/clone.c
parent466e8d5d660ba732c1065ab3329c91e4b4aa7739 (diff)
downloadgit-562bc080934b1bd16099723e80cc82a0dc6356b7.zip
git-562bc080934b1bd16099723e80cc82a0dc6356b7.tar.gz
git-562bc080934b1bd16099723e80cc82a0dc6356b7.tar.bz2
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>
Diffstat (limited to 'builtin/clone.c')
0 files changed, 0 insertions, 0 deletions