summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-05-23 04:46:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-05-23 04:46:02 (GMT)
commitbea1579b80f3e72f44f13dc20398e71b333af2a8 (patch)
tree54eb89f663cc37d5da35be4c202c7c3714a2f70f
parent10c78a162fa821ee85203165b805ff46be454091 (diff)
parent7f1b225153c9e75b805a262feb6796e3bf23dc3d (diff)
downloadgit-bea1579b80f3e72f44f13dc20398e71b333af2a8.zip
git-bea1579b80f3e72f44f13dc20398e71b333af2a8.tar.gz
git-bea1579b80f3e72f44f13dc20398e71b333af2a8.tar.bz2
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'
-rwxr-xr-xt/t7400-submodule-basic.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 1b8f1db..dcac364 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