Merge commit 'upstream/master' into pub/master

[git.ikiwiki.info.git] / doc / bugs / git_mail_notification_race.mdwn

diff --git a/doc/bugs/git_mail_notification_race.mdwn b/doc/bugs/git_mail_notification_race.mdwn
index eddc0181e41e73d90ca5c2be8c983792a3f63f32..58bd82325629597c0e6fbd42972117d84a6f8505 100644 (file)
--- a/doc/bugs/git_mail_notification_race.mdwn
+++ b/doc/bugs/git_mail_notification_race.mdwn
@@ -1,3 +1,5 @@
+[[done]] (in this branch); fixed removing email notification support!
+

 I was suprised to receive two mails from ikiwiki about one web edit:
 
         1   F Oct 30 To joey+ikiwiki update of ikiwiki's plugins/contrib/gallery.mdwn by http://arpitjain11.myopenid.com/
 I was suprised to receive two mails from ikiwiki about one web edit:
 
         1   F Oct 30 To joey+ikiwiki update of ikiwiki's plugins/contrib/gallery.mdwn by http://arpitjain11.myopenid.com/


@@ -44,3 +46,12 @@ edits. At least one of the two commits has to be a non-web commit.
 A related problem is that if two commits are made separately but then
 pushed in together, the commit code only looks at the HEAD commit, which
 is the second one. No notification is sent for the first.
 A related problem is that if two commits are made separately but then
 pushed in together, the commit code only looks at the HEAD commit, which
 is the second one. No notification is sent for the first.

+
+----
+
+Based on all of these problems with using the post-update hook, ikiwiki
+should be changed to use the post-receive hook, which provides enough
+information to avoid the assumuptions that led to these problems.
+Transitioning existing wikis to using a new hook will be interesting. Also,
+this hook is only present in git >= 1.5.0.7.
+--[[Joey]]