diff options
| author | Andy Parkins <andyparkins@gmail.com> | 2007-02-13 14:24:06 +0000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-13 21:40:24 -0800 |
| commit | 44478d99ee0b2c219a733545efe0cb422658bf60 (patch) | |
| tree | e316904a43217d35ad3ce58d5e6cbb16f670d71d /templates | |
| parent | 870b39c15fd084d4db977298b3d3af645b57d083 (diff) | |
| download | git-44478d99ee0b2c219a733545efe0cb422658bf60.tar.gz | |
Only show log entries for new revisions in hooks--update
If you were issuing emails for two branches, and one merged the other,
you would get the same log messages appearing in two separate emails.
e.g. A working repository, where the last push to central was done at
the revision marked "B", after which two branches were developed
further.
* -- B -- 1 -- 1 -- M (branch1)
\ /
2 -- 2 -- 2 (branch2)
Now imagine that branch2 is pushed to the email-generating repository;
an email containing all the "2" revisions would be sent. Now, let's say
branch1 is pushed, the old update hook would run
git-rev-list $newrev ^$baserev
Where $newrev would be "M" and $baserev would be "B". This list
includes all the "2" revisions as well as all the "1" revisions.
This patch addresses this problem by using
git-rev-parse --not --all | git-rev-list --stdin $newrev ^$baserev
To inhibit the display of all revisions that are already in the
repository.
Signed-off-by: Andy Parkins <andyparkins@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/hooks--update | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/hooks--update b/templates/hooks--update index e8c536fb61..a7cf604dd0 100644 --- a/templates/hooks--update +++ b/templates/hooks--update @@ -190,7 +190,8 @@ case "$refname_type" in fi echo "" echo $LOGBEGIN - git-rev-list --pretty $newrev ^$baserev + git-rev-parse --not --all | + git-rev-list --stdin --pretty $newrev ^$baserev echo $LOGEND echo "" echo "Diffstat:" |