diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-09 23:25:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-09 23:25:45 (GMT) |
| commit | ca923f72653f5bfc61933ee334ca5fe34d4fe5f0 (patch) | |
| tree | 2e0439f6b79469bc996b273270891e0cc0b332e6 /t | |
| parent | a5bbc29994b22ab0b57c4dc9568a261d32476e94 (diff) | |
| parent | 327864aaf76d000ee5d7722b9b9611ed7a2708f5 (diff) | |
| download | git-ca923f72653f5bfc61933ee334ca5fe34d4fe5f0.zip git-ca923f72653f5bfc61933ee334ca5fe34d4fe5f0.tar.gz git-ca923f72653f5bfc61933ee334ca5fe34d4fe5f0.tar.bz2 | |
Merge branch 'nd/worktree-prune'
The way "git worktree prune" worked internally has been simplified,
by assuming how "git worktree move" moves an existing worktree to a
different place.
* nd/worktree-prune:
worktree prune: improve prune logic when worktree is moved
worktree: delete dead code
gc.txt: more details about what gc does
Diffstat (limited to 't')
| -rwxr-xr-x | t/t2026-worktree-prune.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t2026-worktree-prune.sh b/t/t2026-worktree-prune.sh index a0f1e3b..b7d6d5d 100755 --- a/t/t2026-worktree-prune.sh +++ b/t/t2026-worktree-prune.sh @@ -78,10 +78,9 @@ test_expect_success 'not prune locked checkout' ' 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 add jlm HEAD && + test -d .git/worktrees/jlm && + rm -rf jlm && git worktree prune --verbose --expire=2.days.ago && test -d .git/worktrees/jlm ' |