mirror of
https://github.com/git/git.git
synced 2024-05-27 23:56:20 +02:00
327864aaf7
Automatic detection of worktree relocation by a user (via 'mv', for
instance) was removed by 618244e160 (worktree: stop supporting moving
worktrees manually - 2016-01-22). Prior to that,
.git/worktrees/<tag>/gitdir was updated whenever the worktree was
accessed in order to let the pruning logic know that the worktree was
"active" even if it disappeared for a while (due to being located on
removable media, for instance).
"git worktree move" has come so we don't really need this, but since
it's easy to do, perhaps we could keep supporting manual worktree move
a bit longer. Notice that when a worktree is active, the "index" file
should be updated pretty often in common case. The logic is updated to
check for index mtime to see if the worktree is alive.
The old logic of checking gitdir's mtime is dropped because nobody
updates it anyway. The new corner case is, if the index file does not
exist, we immediately remove the stale worktree. But if the "index"
file does not exist, you may have a bigger problem.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
96 lines
2.6 KiB
Bash
Executable File
96 lines
2.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='prune $GIT_DIR/worktrees'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success initialize '
|
|
git commit --allow-empty -m init
|
|
'
|
|
|
|
test_expect_success 'worktree prune on normal repo' '
|
|
git worktree prune &&
|
|
test_must_fail git worktree prune abc
|
|
'
|
|
|
|
test_expect_success 'prune files inside $GIT_DIR/worktrees' '
|
|
mkdir .git/worktrees &&
|
|
: >.git/worktrees/abc &&
|
|
git worktree prune --verbose >actual &&
|
|
cat >expect <<EOF &&
|
|
Removing worktrees/abc: not a valid directory
|
|
EOF
|
|
test_i18ncmp expect actual &&
|
|
! test -f .git/worktrees/abc &&
|
|
! test -d .git/worktrees
|
|
'
|
|
|
|
test_expect_success 'prune directories without gitdir' '
|
|
mkdir -p .git/worktrees/def/abc &&
|
|
: >.git/worktrees/def/def &&
|
|
cat >expect <<EOF &&
|
|
Removing worktrees/def: gitdir file does not exist
|
|
EOF
|
|
git worktree prune --verbose >actual &&
|
|
test_i18ncmp expect actual &&
|
|
! test -d .git/worktrees/def &&
|
|
! test -d .git/worktrees
|
|
'
|
|
|
|
test_expect_success SANITY 'prune directories with unreadable gitdir' '
|
|
mkdir -p .git/worktrees/def/abc &&
|
|
: >.git/worktrees/def/def &&
|
|
: >.git/worktrees/def/gitdir &&
|
|
chmod u-r .git/worktrees/def/gitdir &&
|
|
git worktree prune --verbose >actual &&
|
|
test_i18ngrep "Removing worktrees/def: unable to read gitdir file" actual &&
|
|
! test -d .git/worktrees/def &&
|
|
! test -d .git/worktrees
|
|
'
|
|
|
|
test_expect_success 'prune directories with invalid gitdir' '
|
|
mkdir -p .git/worktrees/def/abc &&
|
|
: >.git/worktrees/def/def &&
|
|
: >.git/worktrees/def/gitdir &&
|
|
git worktree prune --verbose >actual &&
|
|
test_i18ngrep "Removing worktrees/def: invalid gitdir file" actual &&
|
|
! test -d .git/worktrees/def &&
|
|
! test -d .git/worktrees
|
|
'
|
|
|
|
test_expect_success 'prune directories with gitdir pointing to nowhere' '
|
|
mkdir -p .git/worktrees/def/abc &&
|
|
: >.git/worktrees/def/def &&
|
|
echo "$(pwd)"/nowhere >.git/worktrees/def/gitdir &&
|
|
git worktree prune --verbose >actual &&
|
|
test_i18ngrep "Removing worktrees/def: gitdir file points to non-existent location" actual &&
|
|
! test -d .git/worktrees/def &&
|
|
! test -d .git/worktrees
|
|
'
|
|
|
|
test_expect_success 'not prune locked checkout' '
|
|
test_when_finished rm -r .git/worktrees &&
|
|
mkdir -p .git/worktrees/ghi &&
|
|
: >.git/worktrees/ghi/locked &&
|
|
git worktree prune &&
|
|
test -d .git/worktrees/ghi
|
|
'
|
|
|
|
test_expect_success 'not prune recent checkouts' '
|
|
test_when_finished rm -r .git/worktrees &&
|
|
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
|
|
'
|
|
|
|
test_expect_success 'not prune proper checkouts' '
|
|
test_when_finished rm -r .git/worktrees &&
|
|
git worktree add --detach "$PWD/nop" master &&
|
|
git worktree prune &&
|
|
test -d .git/worktrees/nop
|
|
'
|
|
|
|
test_done
|