From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 May 2017 04:46:01 +0000 (+0900)
Subject: Merge branch 'bw/submodule-with-bs-path'
X-Git-Tag: v2.14.0-rc0~181
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bea1579b80f3e72f44f13dc20398e71b333af2a8?hp=10c78a162fa821ee85203165b805ff46be454091

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

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
index 1b8f1dbd3a..dcac364c5f 100755
--- 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