diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-01 07:38:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-01 07:38:54 -0700 |
| commit | fbaa22678b10061bcbcc3ed8ed366931c39e6301 (patch) | |
| tree | ec1b9709b0b5bdfa0b4519e13f5cfe6623ccdc28 /t/test-lib.sh | |
| parent | cbe59df99a69069e438aa1d6444036b9cc5d64a2 (diff) | |
| parent | f94ea11cf2b070ef221f0f4c2355a9ee2f340177 (diff) | |
| download | git-fbaa22678b10061bcbcc3ed8ed366931c39e6301.tar.gz git-fbaa22678b10061bcbcc3ed8ed366931c39e6301.tar.xz | |
Merge branch 'js/tests-windows-port-fix'
* js/tests-windows-port-fix:
tests: undo special treatment of CRLF for Windows
Windows: a test_cmp that is agnostic to random LF <> CRLF conversions
t5300-pack-object: do not compare binary data using test_cmp
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 9802b0b0e..b25249ec4 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -752,6 +752,7 @@ case $(uname -s) in test_set_prereq NOT_CYGWIN test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR + GIT_TEST_CMP=mingw_test_cmp ;; *CYGWIN*) test_set_prereq POSIXPERM |