Merge branch 'master' into git-anon

[git.ikiwiki.info.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index f96daab0bb9c55233c2a5a1e0f38a0596d3a1e0f..22addb46337724eecb2e50b2642c76f73d92e8bb 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -118,6 +118,12 @@ sub getconfig () { #{{{
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};

+
+               # optimisation for no-op post_commit 
+               if ($config{post_commit} && ! commit_hook_enabled()) {
+                       exit 0;
+               }
+

                loadplugins();
                checkconfig();
        }
                loadplugins();
                checkconfig();
        }


@@ -183,8 +189,11 @@ sub main () { #{{{
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }

+       elsif ($config{test_receive}) {
+               rcs_test_receive();
+       }

        else {
        else {

-               if (! $config{refresh}) {
+               if ($config{rebuild}) {

                        debug(gettext("rebuilding wiki.."));
                }
                else {
                        debug(gettext("rebuilding wiki.."));
                }
                else {