diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-10 14:45:26 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-10 14:45:27 -0800 |
| commit | 1cf4836865670cadc5d72dc36cdececcb5b32a77 (patch) | |
| tree | 8a6d6971492a343c4b71a79bd5640e491e710818 /t | |
| parent | d78a1968c5465e1ec5f6e14b1edff1b88f5ea3bd (diff) | |
| parent | 49e268e23e313e8c6b009cd8ebbbaae4316cf6cc (diff) | |
| download | git-1cf4836865670cadc5d72dc36cdececcb5b32a77.tar.gz | |
Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks'
Further tweak to a "no backslash in indexed paths" for Windows port
we applied earlier.
* js/mingw-loosen-overstrict-tree-entry-checks:
mingw: safeguard better against backslashes in file names
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7415-submodule-names.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7415-submodule-names.sh b/t/t7415-submodule-names.sh index 7ae0dc8ff4..f70368bc2e 100755 --- a/t/t7415-submodule-names.sh +++ b/t/t7415-submodule-names.sh @@ -209,7 +209,7 @@ test_expect_success MINGW 'prevent git~1 squatting on Windows' ' hash="$(echo x | git hash-object -w --stdin)" && test_must_fail git update-index --add \ --cacheinfo 160000,$rev,d\\a 2>err && - test_i18ngrep backslash err && + test_i18ngrep "Invalid path" err && git -c core.protectNTFS=false update-index --add \ --cacheinfo 100644,$modules,.gitmodules \ --cacheinfo 160000,$rev,c \ |