diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:02 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-21 20:39:03 +0900 |
| commit | 9da9fff14d82e1ce055b664f276a5a96d2f5e946 (patch) | |
| tree | 0c0affd245c2d30fbb7b55f8d415c48fb87cc03c /t | |
| parent | Merge branch 'tz/build-tech-midx-doc' (diff) | |
| parent | clone: fix colliding file detection on APFS (diff) | |
| download | tgif-9da9fff14d82e1ce055b664f276a5a96d2f5e946.tar.xz | |
Merge branch 'nd/clone-case-smashing-warning'
Recently added check for case smashing filesystems did not
correctly utilize the cached stat information, leading to false
breakage detected by our test suite, which has been corrected.
* nd/clone-case-smashing-warning:
clone: fix colliding file detection on APFS
Diffstat (limited to 't')
| -rwxr-xr-x | t/t5601-clone.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh index f1a49e94f5..c28d51bd59 100755 --- a/t/t5601-clone.sh +++ b/t/t5601-clone.sh @@ -628,7 +628,7 @@ test_expect_success 'clone on case-insensitive fs' ' ) ' -test_expect_success !MINGW,!CYGWIN,CASE_INSENSITIVE_FS 'colliding file detection' ' +test_expect_success !MINGW,CASE_INSENSITIVE_FS 'colliding file detection' ' grep X icasefs/warning && grep x icasefs/warning && test_i18ngrep "the following paths have collided" icasefs/warning |