t2401: fix misfiring substitution when path contains w2
PATCH 1/1 t2401: fix misfiring substitution when path contains w2
Fixes a test failure when running inside a trash directory that already contains w2 as a substring, as can be reproduced with
./t2401-worktree-prune.sh --root=/tmp/foow2bar
Fixes 4a3ce479ce7c ("worktree: prune duplicate entries referencing same worktree path")
Signed-off-by Anders Kaseorg <[email protected]>
--- t/t2401-worktree-prune.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
t/t2401-worktree-prune.sh +1 -2
@@ -99,8 +99,7 @@ test_expect_success 'prune duplicate (linked/linked)' ' test_when_finished rm -fr .git/worktrees w1 w2 && git worktree add --detach w1 && git worktree add --detach w2 && - sed "s/w2/w1/" .git/worktrees/w2/gitdir >.git/worktrees/w2/gitdir.new && - mv .git/worktrees/w2/gitdir.new .git/worktrees/w2/gitdir && + cp .git/worktrees/w1/gitdir .git/worktrees/w2/gitdir && git worktree prune --verbose 2>actual && test_i18ngrep "duplicate entry" actual && test -d .git/worktrees/w1 &&
---
base-commit: da8fb6be5594b4a06ef2cc2ff7a5363a6fac2b5a
change-id: 20261110-t2401-substitution-3ab4819833a1
Best regards,
Signature · 1 line
Anders Kaseorg <[email protected]>