Merge branch 'ad/cygwin-no-backslashes-in-paths'

gitster · gitster · commit bb2feec17f49 · 2021-05-07T12:47:39.000+09:00
Cygwin pathname handling fix.

* ad/cygwin-no-backslashes-in-paths:
  cygwin: disallow backslashes in file names
diff --git a/read-cache.c b/read-cache.c
@@ -1011,7 +1011,7 @@ int verify_path(const char *path, unsigned mode)
 				}
 			}
 			if (protect_ntfs) {
-#ifdef GIT_WINDOWS_NATIVE
+#if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
 				if (c == '\\')
 					return 0;
 #endif
diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh
@@ -191,7 +191,7 @@ test_expect_success 'fsck detects corrupt .gitmodules' '
 	)
 '
 
-test_expect_success MINGW 'prevent git~1 squatting on Windows' '
+test_expect_success WINDOWS 'prevent git~1 squatting on Windows' '
 	git init squatting &&
 	(
 		cd squatting &&
@@ -219,10 +219,13 @@ test_expect_success MINGW 'prevent git~1 squatting on Windows' '
 		test_tick &&
 		git -c core.protectNTFS=false commit -m "module"
 	) &&
-	test_must_fail git -c core.protectNTFS=false \
-		clone --recurse-submodules squatting squatting-clone 2>err &&
-	test_i18ngrep -e "directory not empty" -e "not an empty directory" err &&
-	! grep gitdir squatting-clone/d/a/git~2
+	if test_have_prereq MINGW
+	then
+		test_must_fail git -c core.protectNTFS=false \
+			clone --recurse-submodules squatting squatting-clone 2>err &&
+		test_i18ngrep -e "directory not empty" -e "not an empty directory" err &&
+		! grep gitdir squatting-clone/d/a/git~2
+	fi
 '
 
 test_expect_success 'git dirs of sibling submodules must not be nested' '
diff --git a/t/test-lib.sh b/t/test-lib.sh
@@ -1459,6 +1459,7 @@ case $uname_s in
 	test_set_prereq NATIVE_CRLF
 	test_set_prereq SED_STRIPS_CR
 	test_set_prereq GREP_STRIPS_CR
+	test_set_prereq WINDOWS
 	GIT_TEST_CMP=mingw_test_cmp
 	;;
 *CYGWIN*)
@@ -1467,6 +1468,7 @@ case $uname_s in
 	test_set_prereq CYGWIN
 	test_set_prereq SED_STRIPS_CR
 	test_set_prereq GREP_STRIPS_CR
+	test_set_prereq WINDOWS
 	;;
 *)
 	test_set_prereq POSIXPERM

Original file line number	Diff line number	Diff line change
`@@ -1011,7 +1011,7 @@ int verify_path(const char *path, unsigned mode)`
`1011`	`1011`	`}`
`1012`	`1012`	`}`
`1013`	`1013`	`if (protect_ntfs) {`
`1014`		`-#ifdef GIT_WINDOWS_NATIVE`
	`1014`	`+#if defined GIT_WINDOWS_NATIVE \|\| defined __CYGWIN__`
`1015`	`1015`	`if (c == '\\')`
`1016`	`1016`	`return 0;`
`1017`	`1017`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ test_expect_success 'fsck detects corrupt .gitmodules' '`
`191`	`191`	`)`
`192`	`192`	`'`
`193`	`193`
`194`		`-test_expect_success MINGW 'prevent git~1 squatting on Windows' '`
	`194`	`+test_expect_success WINDOWS 'prevent git~1 squatting on Windows' '`
`195`	`195`	`git init squatting &&`
`196`	`196`	`(`
`197`	`197`	`cd squatting &&`
`@@ -219,10 +219,13 @@ test_expect_success MINGW 'prevent git~1 squatting on Windows' '`
`219`	`219`	`test_tick &&`
`220`	`220`	`git -c core.protectNTFS=false commit -m "module"`
`221`	`221`	`) &&`
`222`		`- test_must_fail git -c core.protectNTFS=false \`
`223`		`- clone --recurse-submodules squatting squatting-clone 2>err &&`
`224`		`- test_i18ngrep -e "directory not empty" -e "not an empty directory" err &&`
`225`		`- ! grep gitdir squatting-clone/d/a/git~2`
	`222`	`+ if test_have_prereq MINGW`
	`223`	`+ then`
	`224`	`+ test_must_fail git -c core.protectNTFS=false \`
	`225`	`+ clone --recurse-submodules squatting squatting-clone 2>err &&`
	`226`	`+ test_i18ngrep -e "directory not empty" -e "not an empty directory" err &&`
	`227`	`+ ! grep gitdir squatting-clone/d/a/git~2`
	`228`	`+ fi`
`226`	`229`	`'`
`227`	`230`
`228`	`231`	`test_expect_success 'git dirs of sibling submodules must not be nested' '`