Merge branch 'master' into prefix-directives

1 files changed, 1 insertions, 8 deletions

diff --git a/ikiwiki.in b/ikiwiki.in
index 2aeaf94ec..1ce7e1688 100755
--- a/ikiwiki.in
+++ b/ikiwiki.in
@@ -36,12 +36,10 @@ sub getconfig () { #{{{
 			"cgi!" => \$config{cgi},
 			"discussion!" => \$config{discussion},
 			"w3mmode!" => \$config{w3mmode},
-			"notify!" => \$config{notify},
 			"url=s" => \$config{url},
 			"cgiurl=s" => \$config{cgiurl},
 			"historyurl=s" => \$config{historyurl},
 			"diffurl=s" => \$config{diffurl},
-			"svnrepo" => \$config{svnrepo},
 			"svnpath" => \$config{svnpath},
 			"adminemail=s" => \$config{adminemail},
 			"timeformat=s" => \$config{timeformat},
@@ -123,7 +121,6 @@ sub main () { #{{{
 		gen_wrapper();
 	}
 	elsif ($config{cgi}) {
-		loadindex();
 		require IkiWiki::CGI;
 		cgi();
 	}
@@ -132,10 +129,7 @@ sub main () { #{{{
 		commandline_render();
 	}
 	elsif ($config{post_commit} && ! commit_hook_enabled()) {
-		if ($config{notify}) {
-			loadindex();
-			rcs_notify();
-		}
+		# do nothing
 	}
 	else {
 		lockwiki();
@@ -143,7 +137,6 @@ sub main () { #{{{
 		require IkiWiki::Render;
 		rcs_update();
 		refresh();
-		rcs_notify() if $config{notify};
 		saveindex();
 	}
 } #}}}