diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-08 05:25:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-08 05:25:19 +0100 |
| commit | bfc7ef355423990c40a3ace65faf92db832a848e (patch) | |
| tree | 1d3ab8e0e6cdce39de5f867cc0dc5d9d2532508d /t/test-lib.sh | |
| parent | Merge branch 'js/ci-disable-cmake-by-default' (diff) | |
| parent | tests(mingw): avoid very slow `mingw_test_cmp` (diff) | |
| download | git-bfc7ef355423990c40a3ace65faf92db832a848e.tar.xz git-bfc7ef355423990c40a3ace65faf92db832a848e.zip | |
Merge branch 'js/drop-mingw-test-cmp'
Use `git diff --no-index` as a test_cmp on Windows.
We'd probably need to revisit "do we really want to, and have to,
lose CRLF vs LF?" later, at which time we may be able to further
clean this up by replacing "git diff --no-index" with "diff -u".
* js/drop-mingw-test-cmp:
tests(mingw): avoid very slow `mingw_test_cmp`
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 6db377f68b..4fab1c1984 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -1721,7 +1721,7 @@ case $uname_s in test_set_prereq SED_STRIPS_CR test_set_prereq GREP_STRIPS_CR test_set_prereq WINDOWS - GIT_TEST_CMP=mingw_test_cmp + GIT_TEST_CMP="GIT_DIR=/dev/null git diff --no-index --ignore-cr-at-eol --" ;; *CYGWIN*) test_set_prereq POSIXPERM |