X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8821ba3a590ac25299f17c164f7d0755c5ea97e4..8f5723e1d572664ecac4d0aeed079ab3365719cc:/ikiwiki.in?ds=sidebyside diff --git a/ikiwiki.in b/ikiwiki.in index fd21b4911..ca499b115 100755 --- a/ikiwiki.in +++ b/ikiwiki.in @@ -119,11 +119,6 @@ sub getconfig () { #{{{ } delete $ENV{WRAPPED_OPTIONS}; - # optimisation for no-op post_commit - if ($config{post_commit} && ! commit_hook_enabled()) { - exit 0; - } - loadplugins(); checkconfig(); } @@ -151,7 +146,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(); @@ -167,6 +163,7 @@ sub main () { #{{{ if ($config{dumpsetup}) { $config{srdir}=$config{destdir}=""; + $config{syslog}=1 if $config{setupsyslog}; require IkiWiki::Setup; IkiWiki::Setup::dump($config{dumpsetup}); } @@ -189,6 +186,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.."));