From: Junio C Hamano Date: Sun, 4 Jun 2017 01:20:58 +0000 (+0900) Subject: Merge branch 'bw/submodule-with-bs-path' into maint X-Git-Tag: v2.13.1~37 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c95f0d2f9d616132db863992959b05545f8578cc?hp=-c 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' --- c95f0d2f9d616132db863992959b05545f8578cc diff --combined t/t7400-submodule-basic.sh index 1b8f1dbd3a,d0357f1d8a..dcac364c5f --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@@ -38,14 -38,6 +38,14 @@@ test_expect_success 'submodule update a test_i18ngrep "Submodule path .sub. not initialized" actual ' +test_expect_success 'submodule update aborts on missing gitmodules url' ' + test_when_finished "git update-index --remove sub" && + git update-index --add --cacheinfo 160000,$(git rev-parse HEAD),sub && + test_when_finished "rm -f .gitmodules" && + git config -f .gitmodules submodule.s.path sub && + test_must_fail git submodule init +' + test_expect_success 'configuration parsing' ' test_when_finished "rm -f .gitmodules" && cat >.gitmodules <<-\EOF && @@@ -281,7 -273,7 +281,7 @@@ test_expect_success 'submodule add wit 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