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

* Remove locking code in git rcs_commit. I'm not sure if this was ever 

correct, and it's certianly not correct now, since the wiki is locked
  before rcs_commit is ever called, and should not be unlocked by
  rcs_commit either.
master
Joey Hess 2008-03-07 12:25:40 -05:00
parent eff0e7aa8a
commit fc4c1b7ec8
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Rcs/git.pm
View File

@ -319,13 +319,6 @@ sub rcs_commit ($$$;$$) { #{{{
(length $message ? ": $message" : ""); (length $message ? ": $message" : "");
} }
# XXX: Wiki directory is in the unlocked state when starting this
# action. But it takes time for a Git process to finish its job
# (especially if a merge required), so we must re-lock to prevent
# race conditions. Only when the time of the real commit action
# (i.e. git push) comes, we'll unlock the directory.
lockwiki();
# Check to see if the page has been changed by someone else since # Check to see if the page has been changed by someone else since
# rcs_prepedit was called. # rcs_prepedit was called.
my $cur = git_sha1($file); my $cur = git_sha1($file);
@ -340,7 +333,6 @@ sub rcs_commit ($$$;$$) { #{{{
# so we should ignore its exit status (hence run_or_non). # so we should ignore its exit status (hence run_or_non).
$message = possibly_foolish_untaint($message); $message = possibly_foolish_untaint($message);
if (run_or_non('git', 'commit', '-q', '-m', $message, '-i', $file)) { if (run_or_non('git', 'commit', '-q', '-m', $message, '-i', $file)) {
unlockwiki();
if (length $config{gitorigin_branch}) { if (length $config{gitorigin_branch}) {
run_or_cry('git', 'push', $config{gitorigin_branch}); run_or_cry('git', 'push', $config{gitorigin_branch});
} }

4
debian/changelog vendored
View File

@ -18,6 +18,10 @@ ikiwiki (2.41) UNRELEASED; urgency=low
version 1.0.16 of Text::Markdown. version 1.0.16 of Text::Markdown.
* Updated Spanish translation from Victor Moral. * Updated Spanish translation from Victor Moral.
* Fix example exclude regexp. Closes: #469691 * Fix example exclude regexp. Closes: #469691
* Remove locking code in git rcs_commit. I'm not sure if this was ever
correct, and it's certianly not correct now, since the wiki is locked
before rcs_commit is ever called, and should not be unlocked by
rcs_commit either.
-- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100 -- martin f. krafft <madduck@debian.org> Sun, 02 Mar 2008 17:46:38 +0100