[PATCH 08/19] git-mergetool.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-9-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> --- git-mergetool.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh index 332528f..88e853f 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -205,7 +205,7 @@ checkout_staged_file () { "$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" \ : '\([^ ]*\) ') - if test $? -eq 0 -a -n "$tmpfile" + if test $? -eq 0 && test -n "$tmpfile" then mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3" else @@ -256,7 +256,7 @@ merge_file () { checkout_staged_file 2 "$MERGED" "$LOCAL" checkout_staged_file 3 "$MERGED" "$REMOTE" - if test -z "$local_mode" -o -z "$remote_mode" + if test -z "$local_mode" || test -z "$remote_mode" then echo "Deleted merge conflict for '$MERGED':" describe_file "$local_mode" "local" "$LOCAL"
-- 1.7.10.4