Merge branch 'maint'

diff --git a/t/t5800-remote-helpers.sh b/t/t5800-remote-helpers.sh
index 75a0163c074724513accc9f2a482d72d9e51532c..637d8e97ac4d220437ac168dcce49dfd33aa7a24 100755 (executable)
--- a/t/t5800-remote-helpers.sh
+++ b/t/t5800-remote-helpers.sh
@@ -7,9 +7,15 @@ test_description='Test remote-helper import and export commands'
 
 . ./test-lib.sh
 
-if ! test_have_prereq PYTHON
+if test_have_prereq PYTHON && "$PYTHON_PATH" -c '
+import sys
+if sys.hexversion < 0x02040000:
+    sys.exit(1)
+'
 then
-       say 'skipping git remote-testgit tests: requires Python support'
+       :
+else
+       skip_all='skipping git remote-testgit tests: requires Python 2.4 or newer'
        test_done
 fi