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 /builtin/checkout.c | |
| 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>
Diffstat (limited to 'builtin/checkout.c')
0 files changed, 0 insertions, 0 deletions