From: Simon McVittie <smcv@debian.org>
Date: Wed, 11 Jan 2017 15:33:21 +0000 (+0000)
Subject: git: Do not disable commit hook for temporary working tree
X-Git-Tag: debian/3.20120629.2+deb7u2~16
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/efe05d18ae5633d7a186d2cb97377b6e08ea8f4e

git: Do not disable commit hook for temporary working tree

We exclude .git/hooks from symlinking into the temporary working tree,
which avoids the commit hook being run for the temporary branch anyway.
This avoids the wiki not being updated if an orthogonal change is
received in process A, while process B prepares a revert that is
subsequently cancelled.

(cherry picked from commit d092b0b77701a4c5cd9c8464b774a6a1da1f02cd)
---

diff --git a/IkiWiki/Plugin/git.pm b/IkiWiki/Plugin/git.pm
index c976ca9a2..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 {