Merge branch 'maint-1.6.6' into maint

diff --git a/t/lib-patch-mode.sh b/t/lib-patch-mode.sh
index 06c3c9176207af6c27c924377f29cc2bd0c881e5..ce36f34d0337d29f6ec8f274cd99ad201bd3965d 100644 (file)
--- a/t/lib-patch-mode.sh
+++ b/t/lib-patch-mode.sh
@@ -2,6 +2,11 @@
 
 . ./test-lib.sh
 
+if ! test_have_prereq PERL; then
+       say 'skipping --patch tests, perl not available'
+       test_done
+fi
+
 set_state () {
        echo "$3" > "$1" &&
        git add "$1" &&