From: Elia Pinto <gitter.spiros@gmail.com>
To: git@vger.kernel.org
Cc: jrnieder@gmail.com, Elia Pinto <gitter.spiros@gmail.com>
Subject: [PATCH 08/20] git-mergetool.sh: avoid "test <cond> -a/-o <cond>"
Date: Fri, 6 Jun 2014 07:55:51 -0700 [thread overview]
Message-ID: <1402066563-28519-9-git-send-email-gitter.spiros@gmail.com> (raw)
In-Reply-To: <1402066563-28519-1-git-send-email-gitter.spiros@gmail.com>
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>
---
git-mergetool.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index d08dc92..9a046b7 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
next prev parent reply other threads:[~2014-06-06 14:56 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-06 14:55 [PATCH 00/20] avoid "test <cond> -a/-o <cond>" Elia Pinto
2014-06-06 14:55 ` [PATCH 01/20] check_bindir: " Elia Pinto
2014-06-06 14:55 ` [PATCH 02/20] contrib/examples/git-clone.sh: " Elia Pinto
2014-06-09 23:23 ` Junio C Hamano
2014-06-06 14:55 ` [PATCH 03/20] contrib/examples/git-commit.sh: " Elia Pinto
2014-06-10 18:36 ` David Aguilar
2014-06-06 14:55 ` [PATCH 04/20] contrib/examples/git-merge.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 05/20] contrib/examples/git-repack.sh: " Elia Pinto
2014-06-10 18:39 ` David Aguilar
2014-06-06 14:55 ` [PATCH 06/20] contrib/examples/git-resolve.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 07/20] git-bisect.sh: " Elia Pinto
2014-06-06 14:55 ` Elia Pinto [this message]
2014-06-10 7:37 ` [PATCH 08/20] git-mergetool.sh: " David Aguilar
2014-06-06 14:55 ` [PATCH 09/20] git-rebase--interactive.sh: " Elia Pinto
2014-06-10 18:43 ` David Aguilar
2014-06-06 14:55 ` [PATCH 10/20] git-submodule.sh: " Elia Pinto
2014-06-09 23:23 ` Junio C Hamano
2014-06-10 6:52 ` Johannes Sixt
2014-06-10 8:19 ` Johannes Sixt
2014-06-06 14:55 ` [PATCH 11/20] t/lib-httpd.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 12/20] t/t0025-crlf-auto.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 13/20] t/t0026-eol-config.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 14/20] t/t4102-apply-rename.sh: " Elia Pinto
2014-06-06 14:55 ` [PATCH 15/20] t/t5000-tar-tree.sh: " Elia Pinto
2014-06-10 18:49 ` David Aguilar
2014-06-10 19:21 ` David Aguilar
2014-06-10 20:08 ` David Aguilar
2014-06-10 21:47 ` René Scharfe
2014-06-06 14:55 ` [PATCH 16/20] t/t5403-post-checkout-hook.sh: " Elia Pinto
2014-06-06 14:56 ` [PATCH 17/20] t/t5538-push-shallow.sh: " Elia Pinto
2014-06-06 14:56 ` [PATCH 18/20] t/t9814-git-p4-rename.sh: " Elia Pinto
2014-06-06 14:56 ` [PATCH 19/20] t/test-lib-functions.sh: " Elia Pinto
2014-06-06 14:56 ` [PATCH 20/20] CodingGuidelines: " Elia Pinto
2014-06-06 19:04 ` Torsten Bögershausen
2014-06-09 13:31 ` [PATCH 00/20] " Matthieu Moy
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=1402066563-28519-9-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.