X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/1d46ebef52412b3b93e547ce124d813cf34e3b56..b6774bc6afac48e2c0a122647edc1485e7174a6e:/IkiWiki/Plugin/git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index d1cb247de..7a6a55495 100644
--- a/IkiWiki/Plugin/git.pm
+++ b/IkiWiki/Plugin/git.pm
@@ -1038,10 +1038,6 @@ sub rcs_preprevert ($) {
 		my $failure;
 		my @ret;
 		eval {
-			IkiWiki::disable_commit_hook();
-			push @undo, sub {
-				IkiWiki::enable_commit_hook();
-			};
 			my $branch = "ikiwiki_revert_${sha1}"; # supposed to be unique
 
 			push @undo, sub {
@@ -1099,7 +1095,7 @@ sub rcs_revert ($) {
 
 	ensure_committer();
 
-	if (run_or_non('git', 'merge', '--ff-only', "ikiwiki_revert_$sha1")) {
+	if (run_or_non('git', 'cherry-pick', '--no-commit', "ikiwiki_revert_$sha1")) {
 		return undef;
 	}
 	else {