X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/094af3d113f375f7faf2abf283615582a9977a65..85f4b99710fa94b9b67cee061c37eaf49be36b25:/ikiwiki.in?ds=sidebyside

diff --git a/ikiwiki.in b/ikiwiki.in
index 873bde0df..d601d2739 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -118,6 +118,17 @@ sub getconfig () { #{{{
 			error("WRAPPED_OPTIONS: $@");
 		}
 		delete $ENV{WRAPPED_OPTIONS};
+
+		if ($config{post_commit} && ! commit_hook_enabled()) {
+			# optimisation for no-op post_commit 
+			exit 0;
+		}
+		elsif ($config{test_receive}) {
+			# quick success if the user is trusted
+			require IkiWiki::Receive;
+			exit 0 if IkiWiki::Receive::trusted();
+		}
+
 		loadplugins();
 		checkconfig();
 	}
@@ -145,7 +156,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();
@@ -184,7 +196,8 @@ sub main () { #{{{
 		# do nothing
 	}
 	elsif ($config{test_receive}) {
-		rcs_test_receive();
+		require IkiWiki::Receive;
+		IkiWiki::Receive::test();
 	}
 	else {
 		if ($config{rebuild}) {