git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Richard Hansen <rhansen@bbn.com>
To: git@vger.kernel.org
Cc: felipe.contreras@gmail.com, Richard Hansen <rhansen@bbn.com>
Subject: [PATCH v2 6/9] test-hg.sh: avoid obsolete 'test' syntax
Date: Tue, 12 Nov 2013 00:54:45 -0500	[thread overview]
Message-ID: <1384235688-9655-7-git-send-email-rhansen@bbn.com> (raw)
In-Reply-To: <1384235688-9655-1-git-send-email-rhansen@bbn.com>

The POSIX spec says that the '-a', '-o', and parentheses operands to
the 'test' utility are obsolete extensions due to the potential for
ambiguity.  Replace '-o' with '|| test' to avoid unspecified behavior.

Signed-off-by: Richard Hansen <rhansen@bbn.com>
---
 contrib/remote-helpers/test-hg.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index ceef6b1..5535e8c 100755
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -83,7 +83,7 @@ check_push () {
 		test $ref_ret -ne 0 && echo "match for '$branch' failed" && break
 	done
 
-	if test $expected_ret -ne $ret -o $ref_ret -ne 0
+	if test $expected_ret -ne $ret || test $ref_ret -ne 0
 	then
 		return 1
 	fi
-- 
1.8.5.rc1.208.g8ff7964

  parent reply	other threads:[~2013-11-12  5:55 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-11  4:05 [PATCH 0/7] remote-hg, remote-bzr fixes Richard Hansen
2013-11-11  4:05 ` [PATCH 1/7] remote-hg: don't decode UTF-8 paths into Unicode objects Richard Hansen
2013-11-11 11:04   ` Felipe Contreras
2013-11-11 18:30     ` Richard Hansen
2013-11-11 19:10       ` Felipe Contreras
2013-11-11  4:05 ` [PATCH 2/7] test-bzr.sh, test-hg.sh: allow running from any dir Richard Hansen
2013-11-11 11:35   ` Felipe Contreras
2013-11-11 18:31     ` Junio C Hamano
2013-11-11 18:58       ` Felipe Contreras
2013-11-11  4:05 ` [PATCH 3/7] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple Richard Hansen
2013-11-11 11:37   ` Felipe Contreras
2013-11-11 19:20     ` Richard Hansen
2013-11-11 19:31   ` Felipe Contreras
2013-11-11 21:16     ` Richard Hansen
2013-11-11 21:19       ` Felipe Contreras
2013-11-11  4:05 ` [PATCH 4/7] test-hg.sh: eliminate 'local' bashism Richard Hansen
2013-11-11 11:40   ` Felipe Contreras
2013-11-11  4:05 ` [PATCH 5/7] test-hg.sh: avoid obsolete 'test' syntax Richard Hansen
2013-11-11 11:44   ` Felipe Contreras
2013-11-12  5:34     ` Richard Hansen
2013-11-12 20:23       ` Felipe Contreras
2013-11-11  4:05 ` [PATCH 6/7] test-hg.sh: help user correlate verbose output with email test Richard Hansen
2013-11-11 11:42   ` Felipe Contreras
2013-11-11 19:19     ` Richard Hansen
2013-11-11 19:29       ` Felipe Contreras
2013-11-11 21:17         ` Richard Hansen
2013-11-11  4:05 ` [PATCH 7/7] remote-bzr, remote-hg: fix email address regular expression Richard Hansen
2013-11-11 11:43   ` Felipe Contreras
2013-11-11 18:35 ` [PATCH 0/7] remote-hg, remote-bzr fixes Junio C Hamano
2013-11-12  5:54 ` [PATCH v2 0/9] " Richard Hansen
2013-11-12  5:54   ` [PATCH v2 1/9] remote-hg: don't decode UTF-8 paths into Unicode objects Richard Hansen
2013-11-12  5:54   ` [PATCH v2 2/9] test-lib.sh: convert $TEST_DIRECTORY to an absolute path Richard Hansen
2013-11-12  6:05     ` Richard Hansen
2013-11-12 20:06       ` Junio C Hamano
2013-11-12 20:25       ` Felipe Contreras
2013-11-12  5:54   ` [PATCH v2 3/9] test-bzr.sh, test-hg.sh: allow running from any dir Richard Hansen
2013-11-12  5:54   ` [PATCH v2 4/9] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple Richard Hansen
2013-11-12  5:54   ` [PATCH v2 5/9] test-hg.sh: eliminate 'local' bashism Richard Hansen
2013-11-12  5:54   ` Richard Hansen [this message]
2013-11-12  5:54   ` [PATCH v2 7/9] test-hg.sh: fix duplicate content strings in author tests Richard Hansen
2013-11-12  5:54   ` [PATCH v2 8/9] test-hg.sh: help user correlate verbose output with email test Richard Hansen
2013-11-12  5:54   ` [PATCH v2 9/9] remote-bzr, remote-hg: fix email address regular expression Richard Hansen
2013-11-12 17:59   ` [PATCH v2 0/9] remote-hg, remote-bzr fixes Junio C Hamano
2013-11-12 20:27   ` Felipe Contreras
2013-11-18  4:12   ` [PATCH v3 " Richard Hansen
2013-11-18  4:12     ` [PATCH v3 1/9] remote-hg: don't decode UTF-8 paths into Unicode objects Richard Hansen
2013-11-18  4:12     ` [PATCH v3 2/9] test-lib.sh: convert $TEST_DIRECTORY to an absolute path Richard Hansen
2013-11-18  4:12     ` [PATCH v3 3/9] test-bzr.sh, test-hg.sh: allow running from any dir Richard Hansen
2013-11-18  4:12     ` [PATCH v3 4/9] test-bzr.sh, test-hg.sh: prepare for change to push.default=simple Richard Hansen
2013-11-18  4:12     ` [PATCH v3 5/9] test-hg.sh: eliminate 'local' bashism Richard Hansen
2013-11-18  4:12     ` [PATCH v3 6/9] test-hg.sh: avoid obsolete 'test' syntax Richard Hansen
2013-11-18  4:12     ` [PATCH v3 7/9] test-hg.sh: fix duplicate content strings in author tests Richard Hansen
2013-11-18  4:12     ` [PATCH v3 8/9] test-hg.sh: help user correlate verbose output with email test Richard Hansen
2013-11-18  4:12     ` [PATCH v3 9/9] remote-bzr, remote-hg: fix email address regular expression Richard Hansen
2013-11-18 16:13     ` [PATCH v3 0/9] remote-hg, remote-bzr fixes Junio C Hamano
2013-11-18 21:47     ` Junio C Hamano

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=1384235688-9655-7-git-send-email-rhansen@bbn.com \
    --to=rhansen@bbn.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    /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).