diff options
| -rw-r--r-- | IkiWiki/Plugin/git.pm | 4 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm index 3248f9d8f..c9378af87 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 { diff --git a/debian/changelog b/debian/changelog index 92d1b5697..7eb10caf3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ ikiwiki (3.20161229.1) UNRELEASED; urgency=medium * git: Attribute reverts to the user doing the revert, not the wiki itself. + * git: Do not disable the commit hook while preparing a revert. -- Simon McVittie <smcv@debian.org> Thu, 29 Dec 2016 20:35:51 +0000 |