From: Joey Hess <joey@kodama.kitenet.net>
Date: Thu, 23 Oct 2008 18:09:01 +0000 (-0400)
Subject: Merge branch 'master' into git-anon
X-Git-Tag: 2.68~104
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/62962a470d48dd14ebcd39f1de37504abd2f77b5?ds=sidebyside;hp=-c

Merge branch 'master' into git-anon
---

62962a470d48dd14ebcd39f1de37504abd2f77b5
diff --combined ikiwiki.in
index 873bde0df,fd21b4911..22addb463
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@@ -118,6 -118,12 +118,12 @@@ sub getconfig () { #{{
  			error("WRAPPED_OPTIONS: $@");
  		}
  		delete $ENV{WRAPPED_OPTIONS};
+ 
+ 		# optimisation for no-op post_commit 
+ 		if ($config{post_commit} && ! commit_hook_enabled()) {
+ 			exit 0;
+ 		}
+ 
  		loadplugins();
  		checkconfig();
  	}
@@@ -183,9 -189,6 +189,9 @@@ sub main () { #{{
  	elsif ($config{post_commit} && ! commit_hook_enabled()) {
  		# do nothing
  	}
 +	elsif ($config{test_receive}) {
 +		rcs_test_receive();
 +	}
  	else {
  		if ($config{rebuild}) {
  			debug(gettext("rebuilding wiki.."));