From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: jrnieder@gmail.com, Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 11/19] t/t0025-crlf-auto.sh: convert test -a/-o to && and ||
Date: Tue, 20 May 2014 06:50:24 -0700 [thread overview]
Message-ID: <1400593832-6510-12-git-send-email-gitter.spiros@gmail.com> (raw)
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
next prev parent reply other threads:[~2014-05-20 13:51 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-20 13:50 [PATCH 00/19] convert test -a/-o to && and || patch series Elia Pinto
2014-05-20 13:50 ` [PATCH 01/19] check_bindir: convert test -a/-o to && and || Elia Pinto
2014-05-20 18:12 ` Junio C Hamano
2014-05-20 18:54 ` Junio C Hamano
2014-05-20 13:50 ` [PATCH 02/19] contrib/examples/git-clone.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 03/19] contrib/examples/git-commit.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 04/19] contrib/examples/git-merge.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 05/19] contrib/examples/git-repack.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 06/19] contrib/examples/git-resolve.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 07/19] git-bisect.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 08/19] git-mergetool.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 09/19] git-rebase--interactive.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 10/19] git-submodule.sh: " Elia Pinto
2014-05-20 14:07 ` Matthieu Moy
2014-05-20 14:39 ` Johannes Sixt
2014-05-20 13:50 ` Elia Pinto [this message]
2014-05-20 13:50 ` [PATCH 12/19] t/t0026-eol-config.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 13/19] t/t4102-apply-rename.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 14/19] t/t5000-tar-tree.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 15/19] t/t5403-post-checkout-hook.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 16/19] t/t5537-fetch-shallow.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 17/19] t/t5538-push-shallow.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 18/19] t/t9814-git-p4-rename.sh: " Elia Pinto
2014-05-20 13:50 ` [PATCH 19/19] t/test-lib-functions.sh: " Elia Pinto
2014-05-20 14:09 ` [PATCH 00/19] convert test -a/-o to && and || patch series Matthieu Moy
2014-05-20 17:57 ` Junio C Hamano
2014-05-20 18:22 ` Jonathan Nieder
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1400593832-6510-12-git-send-email-gitter.spiros@gmail.com \
--to=gitter.spiros@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).