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 <redacted>
Reviewed-by: Felipe Contreras <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index ceef6b1917b746008f308fdd5e81358c019bfd4f..5535e8c9be3f3f73c1b32fc1290cd58927bbfc0d 100755 (executable)
--- 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