Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki / Plugin / git.pm

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index 0ee49416ba95b4891b7e5deb42f7ff08502f4e36..c9378af8771ab3070ac61b0c6ff55aa9608dbbb1 100644 (file)
--- 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 {