Skip to contentSkip to conversation

t6130-pathspec-noglob: Windows does not allow a file named "f*"

PATCH In review Johannes Sixt 3 participants 3 messages Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 t/t6130-pathspec-noglob.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
t/t6130-pathspec-noglob.sh +7 -1
index bb5e710..39ef619 100755
@@ -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]"
 '
 
Signature · 15 lines
1.8.1.1672.g5e2a3d4.dirty

-- 
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.

You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en
#1 lore raw

t/t6130-pathspec-noglob.sh test_description='test globbing (and noglob) of pathspec limiting' · line 15

Quoted 12 lines · Johannes Sixt

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.
[...]

t/t6130-pathspec-noglob.sh +7 -1
-	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 &&

Thanks, looks obviously correct to me.

Sorry to break Windows again. It seems I learn about a new gotcha with every patch series. :)

-Peff

#2 lore raw
Quoted 17 lines · Jeff King

t/t6130-pathspec-noglob.sh test_description='test globbing (and noglob) of pathspec limiting' · line 15

Quoted 12 lines · Johannes Sixt

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.
[...]

t/t6130-pathspec-noglob.sh +7 -1
-	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 &&

Thanks, looks obviously correct to me.

Quoted 2 lines

Sorry to break Windows again. It seems I learn about a new gotcha with every patch series. :)

Thanks, both.

It appears that pushing things earlier to 'next' (and unfortunately even to 'master') rather than later seems to be the only way to help catching little gotchas like this ;-).

Signature · 12 lines
*** Please reply-to-all at all times ***
*** (do not pretend to know who is subscribed and who is not) ***
*** Please avoid top-posting. ***
The msysGit Wiki is here: https://github.com/msysgit/msysgit/wiki - Github accounts are free.

You received this message because you are subscribed to the Google
Groups "msysGit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, and view previous threads, visit this group at
http://groups.google.com/group/msysgit?hl=en_US?hl=en