Merge branch 'maint'

diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh
index 86dfee2e4f93750aa72c0b24df57c77faa091aa7..0796a438bc7759292ba900427304ebf9c814c904 100755 (executable)
--- a/t/t9502-gitweb-standalone-parse-output.sh
+++ b/t/t9502-gitweb-standalone-parse-output.sh
@@ -145,9 +145,11 @@ test_expect_success 'forks: not skipped unless "forks" feature enabled' '
        grep -q ">fork of .*<"           gitweb.body
 '
 
-cat >>gitweb_config.perl <<\EOF &&
-$feature{'forks'}{'default'} = [1];
-EOF
+test_expect_success 'enable forks feature' '
+       cat >>gitweb_config.perl <<-\EOF
+       $feature{"forks"}{"default"} = [1];
+       EOF
+'
 
 test_expect_success 'forks: forks skipped if "forks" feature enabled' '
        gitweb_run "a=project_list" &&
@@ -173,7 +175,7 @@ test_expect_success 'forks: can access forked repository' '
 '
 
 test_expect_success 'forks: project_index lists all projects (incl. forks)' '
-       cat >expected <<-\EOF
+       cat >expected <<-\EOF &&
        .git
        foo.bar.git
        foo.git