Merge branch 'master' into next

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index bc3e711a525f164f21132438d4d4e12e3dc10698..6729a18266e9539e3a3b34e200bdaee53e8a67a7 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -33,7 +33,7 @@ then
 fi
 
 merge >/dev/null 2>/dev/null
-if test $? == 127
+if test $? = 127
 then
        echo >&2 'You do not seem to have "merge" installed.
 Please check INSTALL document.'
@@ -42,7 +42,7 @@ fi
 
 . ./test-lib.sh
 
-"$PYTHON" -c 'import subprocess' || {
+test "$no_python" || "$PYTHON" -c 'import subprocess' || {
        echo >&2 'Your python seem to lack "subprocess" module.
 Please check INSTALL document.'
        exit 1