Merge branch 'maint'

diff --git a/t/t9142-git-svn-shallow-clone.sh b/t/t9142-git-svn-shallow-clone.sh
index fd5ad49471dfd1542c23802534eedb7964e66568..1236accd993d5bc1a80fbda720ce229f8e93940c 100755 (executable)
--- a/t/t9142-git-svn-shallow-clone.sh
+++ b/t/t9142-git-svn-shallow-clone.sh
@@ -27,4 +27,6 @@ test_expect_success 'clone trunk with "-r HEAD"' '
        ( cd g && git rev-parse --symbolic --verify HEAD )
 '
 
+stop_httpd
+
 test_done