move untrusted committer test into the wrapper

[ikiwiki.git] / ikiwiki.in

diff --git a/ikiwiki.in b/ikiwiki.in
index 4f24cfc2eb8ae4c53d7c0f471fbf12aea13c0578..f2407b8d0e0d02c6c01e9770eed0199ba9094669 100755 (executable)
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -118,6 +118,12 @@ sub getconfig () { #{{{
                        error("WRAPPED_OPTIONS: $@");
                }
                delete $ENV{WRAPPED_OPTIONS};
+
+               if ($config{post_commit} && ! commit_hook_enabled()) {
+                       # optimisation for no-op post_commit 
+                       exit 0;
+               }
+
                loadplugins();
                checkconfig();
        }
@@ -145,7 +151,8 @@ sub main () { #{{{
                                        if exists $config{setupsyslog};
                                delete @config{qw(setupsyslog setupverbose wrappers genwrappers rebuild)};
                                checkconfig();
-                               if (! $config{cgi} && ! $config{post_commit}) {
+                               if (! $config{cgi} && ! $config{post_commit} &&
+                                   ! $config{test_receive}) {
                                        $config{post_commit}=1;
                                }
                                gen_wrapper();
@@ -183,6 +190,10 @@ sub main () { #{{{
        elsif ($config{post_commit} && ! commit_hook_enabled()) {
                # do nothing
        }
+       elsif ($config{test_receive}) {
+               require IkiWiki::Receive;
+               IkiWiki::Receive::test();
+       }
        else {
                if ($config{rebuild}) {
                        debug(gettext("rebuilding wiki.."));