Merge branch 'maint'

diff --git a/t/t9700-perl-git.sh b/t/t9700-perl-git.sh
index b81d5dfc340e050815ad9b2fd0d0636c529ce8d3..4eb7d3f7f042f896106f208a7f8bb91925352b2a 100755 (executable)
--- a/t/t9700-perl-git.sh
+++ b/t/t9700-perl-git.sh
@@ -6,8 +6,13 @@
 test_description='perl interface (Git.pm)'
 . ./test-lib.sh
 
+if ! test_have_prereq PERL; then
+       say 'skipping perl interface tests, perl not available'
+       test_done
+fi
+
 perl -MTest::More -e 0 2>/dev/null || {
-       say_color skip "Perl Test::More unavailable, skipping test"
+       say "Perl Test::More unavailable, skipping test"
        test_done
 }
 
@@ -24,6 +29,10 @@ test_expect_success \
      git add . &&
      git commit -m "first commit" &&
 
+     echo "new file in subdir 2" > directory2/file2 &&
+     git add . &&
+     git commit -m "commit in directory2" &&
+
      echo "changed file 1" > file1 &&
      git commit -a -m "second commit" &&