diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:39 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-07 12:47:39 +0900 |
| commit | bb2feec17f49e93e0b983c5d895b2bf590ff92f3 (patch) | |
| tree | 7bc1000205cfeda64891c23069dd196deabbb85d | |
| parent | Merge branch 'jz/apply-3way-first-message-fix' (diff) | |
| parent | cygwin: disallow backslashes in file names (diff) | |
| download | git-bb2feec17f49e93e0b983c5d895b2bf590ff92f3.tar.gz git-bb2feec17f49e93e0b983c5d895b2bf590ff92f3.zip | |
Merge branch 'ad/cygwin-no-backslashes-in-paths'
Cygwin pathname handling fix.
* ad/cygwin-no-backslashes-in-paths:
cygwin: disallow backslashes in file names
| -rw-r--r-- | read-cache.c | 2 | ||||
| -rwxr-xr-x | t/t7415-submodule-names.sh | 13 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/read-cache.c b/read-cache.c index 72a1d339c9..eb66fddb1b 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1011,7 +1011,7 @@ inside: } } if (protect_ntfs) { -#ifdef GIT_WINDOWS_NATIVE +#if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__ if (c == '\\') return 0; #endif diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh index f70368bc2e..6bf098a6be 100755 --- a/t/t7415-submodule-names.sh +++ b/t/t7415-submodule-names.sh @@ -191,7 +191,7 @@ test_expect_success 'fsck detects corrupt .gitmodules' ' ) ' -test_expect_success MINGW 'prevent git~1 squatting on Windows' ' +test_expect_success WINDOWS 'prevent git~1 squatting on Windows' ' git init squatting && ( cd squatting && @@ -219,10 +219,13 @@ test_expect_success MINGW 'prevent git~1 squatting on Windows' ' test_tick && git -c core.protectNTFS=false commit -m "module" ) && - test_must_fail git -c core.protectNTFS=false \ - clone --recurse-submodules squatting squatting-clone 2>err && - test_i18ngrep -e "directory not empty" -e "not an empty directory" err && - ! grep gitdir squatting-clone/d/a/git~2 + if test_have_prereq MINGW + then + test_must_fail git -c core.protectNTFS=false \ + clone --recurse-submodules squatting squatting-clone 2>err && + test_i18ngrep -e "directory not empty" -e "not an empty directory" err && + ! grep gitdir squatting-clone/d/a/git~2 + fi ' test_expect_success 'git dirs of sibling submodules must not be nested' ' diff --git a/t/test-lib.sh b/t/test-lib.sh index 3dec266221..adaa2db601 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1459,6 +1459,7 @@ case $uname_s in test_set_prereq NATIVE_CRLF test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR + test_set_prereq WINDOWS GIT_TEST_CMP=mingw_test_cmp ;; *CYGWIN*) @@ -1467,6 +1468,7 @@ case $uname_s in test_set_prereq CYGWIN test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR + test_set_prereq WINDOWS ;; *) test_set_prereq POSIXPERM |