]> git.ipfire.org Git - thirdparty/git.git/commitdiff
worktree: add test for path handling in linked worktrees
authorCaleb White <cdwhite3@pm.me>
Tue, 8 Oct 2024 03:12:32 +0000 (22:12 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 Oct 2024 18:49:22 +0000 (11:49 -0700)
A failure scenario reported in an earlier patch series[1] that several
`git worktree` subcommands failed or misbehaved when invoked from within
linked worktrees that used relative paths.

This adds a test that executes a `worktree prune` command inside both an
internally and an externally linked worktree and asserts that the other
worktree was not pruned.

[1]: https://lore.kernel.org/git/CAPig+cQXFy=xPVpoSq6Wq0pxMRCjS=WbkgdO+3LySPX=q0nPCw@mail.gmail.com/

Reported-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Caleb White <cdwhite3@pm.me>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t2401-worktree-prune.sh

index 71aa9bcd620f8a504fe628a2d7332d8b47fd4701..976d048e3efc74be9cd909ce76d552b3944d2e10 100755 (executable)
@@ -120,4 +120,23 @@ test_expect_success 'prune duplicate (main/linked)' '
        ! test -d .git/worktrees/wt
 '
 
+test_expect_success 'not prune proper worktrees when run inside linked worktree' '
+       test_when_finished rm -rf repo wt_ext &&
+       git init repo &&
+       (
+           cd repo &&
+           echo content >file &&
+           git add file &&
+           git commit -m msg &&
+           git worktree add ../wt_ext &&
+           git worktree add wt_int &&
+           cd wt_int &&
+           git worktree prune -v >out &&
+           test_must_be_empty out &&
+           cd ../../wt_ext &&
+           git worktree prune -v >out &&
+           test_must_be_empty out
+       )
+'
+
 test_done