mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
t/t0026-eol-config.sh: avoid "test <cond> -a/-o <cond>"
The construct is error-prone; "test" being built-in in most modern shells, the reason to avoid "test <cond> && test <cond>" spawning one extra process by using a single "test <cond> -a <cond>" no longer exists. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
fbaff7a262
commit
66e1fe7db6
|
@ -36,7 +36,7 @@ test_expect_success 'eol=lf puts LFs in normalized file' '
|
|||
! has_cr two &&
|
||||
onediff=$(git diff one) &&
|
||||
twodiff=$(git diff two) &&
|
||||
test -z "$onediff" -a -z "$twodiff"
|
||||
test -z "$onediff" && test -z "$twodiff"
|
||||
'
|
||||
|
||||
test_expect_success 'eol=crlf puts CRLFs in normalized file' '
|
||||
|
@ -49,7 +49,7 @@ test_expect_success 'eol=crlf puts CRLFs in normalized file' '
|
|||
! has_cr two &&
|
||||
onediff=$(git diff one) &&
|
||||
twodiff=$(git diff two) &&
|
||||
test -z "$onediff" -a -z "$twodiff"
|
||||
test -z "$onediff" && test -z "$twodiff"
|
||||
'
|
||||
|
||||
test_expect_success 'autocrlf=true overrides eol=lf' '
|
||||
|
@ -63,7 +63,7 @@ test_expect_success 'autocrlf=true overrides eol=lf' '
|
|||
has_cr two &&
|
||||
onediff=$(git diff one) &&
|
||||
twodiff=$(git diff two) &&
|
||||
test -z "$onediff" -a -z "$twodiff"
|
||||
test -z "$onediff" && test -z "$twodiff"
|
||||
'
|
||||
|
||||
test_expect_success 'autocrlf=true overrides unset eol' '
|
||||
|
@ -77,7 +77,7 @@ test_expect_success 'autocrlf=true overrides unset eol' '
|
|||
has_cr two &&
|
||||
onediff=$(git diff one) &&
|
||||
twodiff=$(git diff two) &&
|
||||
test -z "$onediff" -a -z "$twodiff"
|
||||
test -z "$onediff" && test -z "$twodiff"
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue