summaryrefslogtreecommitdiff
path: root/contrib/remote-helpers
diff options
context:
space:
mode:
authorRichard Hansen <rhansen@bbn.com>2013-11-18 04:12:47 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-11-18 21:45:58 (GMT)
commit25607db2c30c618a18f66350f01b1ccb05c551c6 (patch)
treef2c517b60d60b9e292b04f796efdc0226803933c /contrib/remote-helpers
parent5105edd411bc472015d63eadaf1f826bebdc92e5 (diff)
downloadgit-25607db2c30c618a18f66350f01b1ccb05c551c6.zip
git-25607db2c30c618a18f66350f01b1ccb05c551c6.tar.gz
git-25607db2c30c618a18f66350f01b1ccb05c551c6.tar.bz2
test-hg.sh: avoid obsolete 'test' syntax
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> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/remote-helpers')
-rwxr-xr-xcontrib/remote-helpers/test-hg.sh2
1 files changed, 1 insertions, 1 deletions
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