diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-01-08 21:22:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-08 21:22:32 (GMT) |
| commit | 7e7d71e7ced3d160e45da07ef28457cb82ebd70d (patch) | |
| tree | df07136a543c6817fb19c4d05c03021e855093c0 /t | |
| parent | 2d0029e38f3ecd355b403ffa8a75416129439185 (diff) | |
| parent | 6af95e8cbe431480e4504e7848c66c523beda2a4 (diff) | |
| download | git-7e7d71e7ced3d160e45da07ef28457cb82ebd70d.zip git-7e7d71e7ced3d160e45da07ef28457cb82ebd70d.tar.gz git-7e7d71e7ced3d160e45da07ef28457cb82ebd70d.tar.bz2 | |
Merge branch 'jk/pathspec-literal'
Finishing touches to fix a test breakage on Windows
* jk/pathspec-literal:
t6130-pathspec-noglob: Windows does not allow a file named "f*"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6130-pathspec-noglob.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh index bb5e710..39ef619 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]" ' |