Merge branch 'maint'

diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index 35c151d7ead1181eb36c5a29c0bcc7aac4ec5c12..53297156a314a5b5e03385a3ad887eff959359c4 100755 (executable)
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -446,6 +446,8 @@ test_expect_success \
 test_expect_success \
        'encode(commit): utf8' \
        '. "$TEST_DIRECTORY"/t3901-utf8.txt &&
+        test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
+        test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
         echo "UTF-8" >> file &&
         git add file &&
         git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
@@ -454,11 +456,13 @@ test_expect_success \
 test_expect_success \
        'encode(commit): iso-8859-1' \
        '. "$TEST_DIRECTORY"/t3901-8859-1.txt &&
+        test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
+        test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
         echo "ISO-8859-1" >> file &&
         git add file &&
         git config i18n.commitencoding ISO-8859-1 &&
+        test_when_finished "git config --unset i18n.commitencoding" &&
         git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
-        git config --unset i18n.commitencoding &&
         gitweb_run "p=.git;a=commit"'
 
 test_expect_success \
@@ -591,4 +595,69 @@ test_expect_success HIGHLIGHT \
         git commit -m "Add test.sh" &&
         gitweb_run "p=.git;a=blob;f=test.sh"'
 
+# ----------------------------------------------------------------------
+# forks of projects
+
+cat >>gitweb_config.perl <<\EOF &&
+$feature{'forks'}{'default'} = [1];
+EOF
+
+test_expect_success \
+       'forks: prepare' \
+       'git init --bare foo.git &&
+        git --git-dir=foo.git --work-tree=. add file &&
+        git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
+        echo "foo" > foo.git/description &&
+        mkdir -p foo &&
+        (cd foo &&
+         git clone --shared --bare ../foo.git foo-forked.git &&
+         echo "fork of foo" > foo-forked.git/description)'
+
+test_expect_success \
+       'forks: projects list' \
+       'gitweb_run'
+
+test_expect_success \
+       'forks: forks action' \
+       'gitweb_run "p=foo.git;a=forks"'
+
+# ----------------------------------------------------------------------
+# content tags (tag cloud)
+
+cat >>gitweb_config.perl <<-\EOF &&
+# we don't test _setting_ content tags, so any true value is good
+$feature{'ctags'}{'default'} = ['ctags_script.cgi'];
+EOF
+
+test_expect_success \
+       'ctags: tag cloud in projects list' \
+       'mkdir .git/ctags &&
+        echo "2" > .git/ctags/foo &&
+        echo "1" > .git/ctags/bar &&
+       gitweb_run'
+
+test_expect_success \
+       'ctags: search projects by existing tag' \
+       'gitweb_run "by_tag=foo"'
+
+test_expect_success \
+       'ctags: search projects by non existent tag' \
+       'gitweb_run "by_tag=non-existent"'
+
+test_expect_success \
+       'ctags: malformed tag weights' \
+       'mkdir -p .git/ctags &&
+        echo "not-a-number" > .git/ctags/nan &&
+        echo "not-a-number-2" > .git/ctags/nan2 &&
+        echo "0.1" >.git/ctags/floating-point &&
+        gitweb_run'
+
+# ----------------------------------------------------------------------
+# categories
+
+test_expect_success \
+       'categories: projects list, only default category' \
+       'echo "\$projects_list_group_categories = 1;" >>gitweb_config.perl &&
+        gitweb_run'
+
 test_done