urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
master
Simon McVittie 2016-12-29 20:46:20 +00:00
parent afda054796
commit d092b0b777
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IkiWiki/Plugin/git.pm
View File

@ -1038,10 +1038,6 @@ sub rcs_preprevert ($) {
my $failure; my $failure;
my @ret; my @ret;
eval { eval {
IkiWiki::disable_commit_hook();
push @undo, sub {
IkiWiki::enable_commit_hook();
};
my $branch = "ikiwiki_revert_${sha1}"; # supposed to be unique my $branch = "ikiwiki_revert_${sha1}"; # supposed to be unique
push @undo, sub { push @undo, sub {

1
debian/changelog vendored
View File

@ -2,6 +2,7 @@ ikiwiki (3.20161229.1) UNRELEASED; urgency=medium
* git: Attribute reverts to the user doing the revert, not the wiki * git: Attribute reverts to the user doing the revert, not the wiki
itself. 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 -- Simon McVittie <smcv@debian.org> Thu, 29 Dec 2016 20:35:51 +0000