summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-04 10:20:58 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-04 10:20:58 +0900
commitc95f0d2f9d616132db863992959b05545f8578cc (patch)
tree6393240d4271657e0553f6336c045dd92d1cf5ad
parentMerge branch 'ah/log-decorate-default-to-auto' into maint (diff)
parentt7400: add !CYGWIN prerequisite to 'add with \\ in path' (diff)
downloadtgif-c95f0d2f9d616132db863992959b05545f8578cc.tar.xz
Merge branch 'bw/submodule-with-bs-path' into maint
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 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