Merge branch 'bw/submodule-with-bs-path' into maint

gitster · gitster · commit c95f0d2f9d61 · 2017-06-04T10:20:58.000+09:00
A hotfix to a topic that is already in v2.13.

* bw/submodule-with-bs-path:
  t7400: add !CYGWIN prerequisite to 'add with \\ in path'
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
@@ -281,7 +281,7 @@ test_expect_success 'submodule add with ./, /.. and // in path' '
 	test_cmp empty untracked
 '
 
-test_expect_success 'submodule add with \\ in path' '
+test_expect_success !CYGWIN 'submodule add with \\ in path' '
 	test_when_finished "rm -rf parent sub\\with\\backslash" &&
 
 	# Initialize a repo with a backslash in its name

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ test_expect_success 'submodule add with ./, /.. and // in path' '`
`281`	`281`	`test_cmp empty untracked`
`282`	`282`	`'`
`283`	`283`
`284`		`-test_expect_success 'submodule add with \\ in path' '`
	`284`	`+test_expect_success !CYGWIN 'submodule add with \\ in path' '`
`285`	`285`	`test_when_finished "rm -rf parent sub\\with\\backslash" &&`
`286`	`286`
`287`	`287`	`# Initialize a repo with a backslash in its name`