aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2013-01-06 15:07:43 +0100
committerJunio C Hamano <gitster@pobox.com>2013-01-06 11:29:31 -0800
commit6af95e8cbe431480e4504e7848c66c523beda2a4 (patch)
tree636c84e85436039ddcdc001f8b1a7df5568e8484
parent823ab40fd4adc5bf5b5c66b6d189deae34d2a138 (diff)
downloadgit-6af95e8cbe431480e4504e7848c66c523beda2a4.tar.gz
git-6af95e8cbe431480e4504e7848c66c523beda2a4.tar.xz
t6130-pathspec-noglob: Windows does not allow a file named "f*"
Windows disallows file names that contain a star. Arrange the test setup to insert the file name "f*" in the repository without the corresponding file in the worktree. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t6130-pathspec-noglob.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh
index bb5e71005..39ef61994 100755
--- a/t/t6130-pathspec-noglob.sh
+++ b/t/t6130-pathspec-noglob.sh
@@ -6,7 +6,13 @@ test_description='test globbing (and noglob) of pathspec limiting'
test_expect_success 'create commits with glob characters' '
test_commit unrelated bar &&
test_commit vanilla foo &&
- test_commit star "f*" &&
+ # insert file "f*" in the commit, but in a way that avoids
+ # the name "f*" in the worktree, because it is not allowed
+ # on Windows (the tests below do not depend on the presence
+ # of the file in the worktree)
+ git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
+ test_tick &&
+ git commit -m star &&
test_commit bracket "f[o][o]"
'