[PATCH 11/19] t/t0025-crlf-auto.sh: convert test -a/-o to && and ||
- From
Elia Pinto <gitter.spiros@gmail.com>
- Date
- May 20, 2014, 13:50 UTC
- Message-ID
- <1400593832-6510-12-git-send-email-gitter.spiros@gmail.com>
- In-Reply-To
- <1400593832-6510-1-git-send-email-gitter.spiros@gmail.com>
The interaction with unary operators and operator precedence for && and || are better known than -a and -o, and for that reason we prefer them. Replace all existing instances of -a and -o to save readers from the burden of thinking about such things.
Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> --- t/t0025-crlf-auto.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/t/t0025-crlf-auto.sh b/t/t0025-crlf-auto.sh index f5f67a6..a13fc56 100755 --- a/t/t0025-crlf-auto.sh +++ b/t/t0025-crlf-auto.sh @@ -36,7 +36,7 @@ test_expect_success 'default settings cause no changes' ' onediff=`git diff one` && twodiff=`git diff two` && threediff=`git diff three` && - test -z "$onediff" -a -z "$twodiff" -a -z "$threediff" + test -z "$onediff" && test -z "$twodiff" && test -z "$threediff" ' test_expect_success 'crlf=true causes a CRLF file to be normalized' ' @@ -111,7 +111,7 @@ test_expect_success 'autocrlf=true does not normalize CRLF files' ' onediff=`git diff one` && twodiff=`git diff two` && threediff=`git diff three` && - test -z "$onediff" -a -z "$twodiff" -a -z "$threediff" + test -z "$onediff" && test -z "$twodiff" && test -z "$threediff" ' test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' ' @@ -126,7 +126,7 @@ test_expect_success 'text=auto, autocrlf=true _does_ normalize CRLF files' ' onediff=`git diff one` && twodiff=`git diff two` && threediff=`git diff three` && - test -z "$onediff" -a -n "$twodiff" -a -z "$threediff" + test -z "$onediff" && test -n "$twodiff" && test -z "$threediff" ' test_expect_success 'text=auto, autocrlf=true does not normalize binary files' '
-- 1.7.10.4