X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/12c5786df4e74c143f24398b8d0028000b61daba..19d8acaa95ee252e3ca2bff956ad8b5d951f1381:/IkiWiki/Plugin/git.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 5e302729e..b683e4ec3 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -11,6 +11,9 @@ my $sha1_pattern     = qr/[0-9a-fA-F]{40}/; # pattern to validate Git sha1sums
 my $dummy_commit_msg = 'dummy commit';      # message to skip in recent changes
 
 sub import { #{{{
+	if (exists $IkiWiki::hooks{rcs}) {
+		error(gettext("cannot use multiple rcs plugins"));
+	}
 	hook(type => "checkconfig", id => "git", call => \&checkconfig);
 	hook(type => "getsetup", id => "git", call => \&getsetup);
 	hook(type => "rcs", id => "rcs_update", call => \&rcs_update);
@@ -411,11 +414,23 @@ sub rcs_commit_staged ($$$) {
 		$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
 	}
 
+	$message = IkiWiki::possibly_foolish_untaint($message);
+	my @opts;
+	if ($message !~ /\S/) {
+		# Force git to allow empty commit messages.
+		# (If this version of git supports it.)
+		my ($version)=`git --version` =~ /git version (.*)/;
+		if ($version ge "1.5.4") {
+			push @opts, '--cleanup=verbatim';
+		}
+		else {
+			$message.=".";
+		}
+	}
+	push @opts, '-q';
 	# git commit returns non-zero if file has not been really changed.
 	# so we should ignore its exit status (hence run_or_non).
-	$message = IkiWiki::possibly_foolish_untaint($message);
-	if (run_or_non('git', 'commit', '--cleanup=verbatim',
-	               '-q', '-m', $message)) {
+	if (run_or_non('git', 'commit', @opts, '-m', $message)) {
 		if (length $config{gitorigin_branch}) {
 			run_or_cry('git', 'push', $config{gitorigin_branch});
 		}