From: Joey Hess <joey@kitenet.net>
Date: Sat, 23 Oct 2010 21:13:04 +0000 (-0400)
Subject: nice message if someone tries to revert a merge commit
X-Git-Tag: 3.20101023~2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/5db2d6f6b224872b119535d57e675d12a2c7dfe1?hp=0cc2a36f593fd14b6345ad2c0b446edb2bafbe2e

nice message if someone tries to revert a merge commit
---

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index f8e16859b..f5101d904 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -848,9 +848,20 @@ sub rcs_preprevert ($) {
 	# in order to see all changes.
 	my ($subdir, $rootdir) = git_find_root();
 	$git_dir=$rootdir;
-	my @ret=git_parse_changes(git_commit_info($sha1, 1));
+	my @commits=git_commit_info($sha1, 1);
 	$git_dir=undef;
-	return @ret;
+
+	if (! @commits) {
+		error "unknown commit"; # just in case
+	}
+
+	# git revert will fail on merge commits. Add a nice message.
+	if (exists $commits[0]->{parents} &&
+	    @{$commits[0]->{parents}} > 1) {
+		error gettext("you are not allowed to revert a merge");
+	}
+
+	return git_parse_changes(@commits);
 }
 
 sub rcs_revert ($) {
diff --git a/debian/changelog b/debian/changelog
index cee42dc85..b304e4b86 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-ikiwiki (3.20101020) UNRELEASED; urgency=low
+ikiwiki (3.20101023) unstable; urgency=low
 
   * Fix typo that broke anonymous git push.
-  * fix web reversion when the srcdir is in a subdir of the git repo.
+  * Fix web reversion when the srcdir is in a subdir of the git repo.
 
- -- Joey Hess <joeyh@debian.org>  Sat, 23 Oct 2010 15:25:19 -0400
+ -- Joey Hess <joeyh@debian.org>  Sat, 23 Oct 2010 16:36:50 -0400
 
 ikiwiki (3.20101019) unstable; urgency=low