From: Michael Haggerty <mhagger@alum.mit.edu>
To: git discussion list <git@vger.kernel.org>
Cc: Andy Parkins <andyparkins@gmail.com>
Subject: Bug: post-receive-email sometimes misses commits
Date: Mon, 27 Feb 2012 21:39:37 +0100 [thread overview]
Message-ID: <4F4BEA09.90600@alum.mit.edu> (raw)
In the following scenario, suppose that commit X is already in the
repository (referenced by master), and I push references A and B at the
same time:
-- master
/
o---X---*'--*'--* A
\
*---* B
The commits marked with "*" are new to the repository, and therefore the
emails generated by post-receive-email should summarize all five of
them. But in fact the commits marked with a prime (i.e., A^ and A^^)
are NOT included in any email.
The problem is that post-receive-email operates on one reference update
at a time, *after* the references have been updated. It generates the
"new" commits for A using the equivalent of
git rev-list ^master ^B A
and it generates the "new" commits for B using the equivalent of
git rev-list ^master ^B A
Neither of these ranges includes the commits common to branches A and B
and therefore those commits do not appear in any of the email notifications.
I first observed this problem in a slightly more complicated scenario
where a bugfix branch was merged to two release branches, then the two
release branches (but not the bugfix reference) were pushed:
o---o-------* release-A
/ /
o---o---o---*'--*'--*' bugfix
\ \
o---o-------* release-B
In this case only the merge commits were included in the commit emails;
the bugfixes commits themselves were never mentioned.
It seems like this problem can only be fixed by having
post-receive-email process all of the reference updates at once so that
the email generation for one reference update can take into account the
other references that were updated at the same time.
I don't plan to work on this problem; locally, we are using a Python
script that was derived from post-receive-email and enhanced in several
ways rather than using the Shell-script original. So when I have fixed
our Python script my own itch will have been scratched. If there is
interest in the Python email-notification script please let me know and
there is a chance I might clean it up enough to be released.
Michael
--
Michael Haggerty
mhagger@alum.mit.edu
http://softwareswirl.blogspot.com/
next reply other threads:[~2012-02-27 20:39 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-27 20:39 Michael Haggerty [this message]
2012-02-27 20:43 ` Bug: post-receive-email sometimes misses commits Michael Haggerty
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4F4BEA09.90600@alum.mit.edu \
--to=mhagger@alum.mit.edu \
--cc=andyparkins@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).