aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-01-28 17:55:58 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-01-28 17:55:58 -0500
commitf7b86d8177efbe90b49acb93ae1f056714dc0851 (patch)
tree4c1277a9dc6d43cc7147ed8d71b0225cbd6d2dd1
parent2ad1850a5a90b6768f5bc6ab1627d2f2136cd13a (diff)
downloadikiwiki-f7b86d8177efbe90b49acb93ae1f056714dc0851.tar
ikiwiki-f7b86d8177efbe90b49acb93ae1f056714dc0851.tar.gz
pushing two commits in at once leads to a related problem
-rw-r--r--doc/bugs/git_mail_notification_race.mdwn8
1 files changed, 7 insertions, 1 deletions
diff --git a/doc/bugs/git_mail_notification_race.mdwn b/doc/bugs/git_mail_notification_race.mdwn
index ebe158fb9..eddc0181e 100644
--- a/doc/bugs/git_mail_notification_race.mdwn
+++ b/doc/bugs/git_mail_notification_race.mdwn
@@ -4,7 +4,7 @@ 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/
The first of these had the correct diff for the changes made by the web
- edit (00259020061577316895370ee04cf00b634db98a).
+edit (00259020061577316895370ee04cf00b634db98a).
But the second had a diff for modifications I made to ikiwiki code
around the same time (2a6e353c205a6c2c8b8e2eaf85fe9c585c1af0cd).
@@ -38,3 +38,9 @@ diff for the first commit.
Ikiwiki's own locking prevents this from happenning if both commits are web
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.