Merge branch 'jk/xdiff-clamp-funcname-context-index'

diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index d83a9f0fdc0faaef9756166f7b6223212514a7d6..e819ba741ec96018755a08ef956998edfdd1dcc4 100755 (executable)
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -570,6 +570,11 @@ test_expect_success '"add" an existing locked but missing worktree' '
        git worktree add --force --force --detach gnoo
 '
 
+test_expect_success FUNNYNAMES 'sanitize generated worktree name' '
+       git worktree add --detach ".  weird*..?.lock.lock" &&
+       test -d .git/worktrees/---weird-.-
+'
+
 test_expect_success '"add" should not fail because of another bad worktree' '
        git init add-fail &&
        (