[gnus git] branch master updated: n0-13-45-ge9156c3 =1= Fix the e-mail message to use "git describe" and the commits.

       via  e9156c3bb674c2423e992c544ae8616a340e8003 (commit)
      from  179b4b59eaa86dc2483dff7e775d7808e21eabc4 (commit)


- Log -----------------------------------------------------------------
commit e9156c3bb674c2423e992c544ae8616a340e8003
Author: Ted Zlatanov <[email protected]>
Date:   Fri Feb 25 04:56:42 2011 -0600

    Fix the e-mail message to use "git describe" and the commits.
    
    * post-receive: Always show the commit messages and the "git describe"
    output.

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 775c3a4..a127951 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-25  Teodor Zlatanov  <[email protected]>
+
+	* post-receive: Always show the commit messages and the "git describe"
+	output.
+
 2011-02-18  Teodor Zlatanov  <[email protected]>
 
 	* post-receive: Fix $(( bug.  Note that the user name and address are
diff --git a/etc/post-receive b/etc/post-receive
index ebd230c..5714dcc 100755
--- a/etc/post-receive
+++ b/etc/post-receive
@@ -182,9 +182,13 @@ generate_email()
 	# Email parameters
 	# The email subject will contain the best description of the ref
 	# that we can build from the parameters
-	describe=$(git describe $rev 2>/dev/null)
-	if [ -z "$describe" ]; then
-		describe=$( (git log --format="%s" $oldrev...$newrev | perl -e'@p = <>; chomp @p; print "=", scalar @p, "= ", join(" ; ", @p)') 2>/dev/null)
+	describe_commit=$( (git log --format="%s" $oldrev...$newrev | perl -e'@p = <>; chomp @p; print "=", scalar @p, "= ", join(" ; ", @p)') 2>/dev/null)
+	describe_last=$(git describe $rev 2>/dev/null)
+
+	if [ -z "$describe_last" ]; then
+	    describe=$describe_commit
+        else
+            describe="$describe_last $describe_commit"
 	fi
 
 	if [ -z "$describe" ]; then

-----------------------------------------------------------------------
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we listed those
revisions in full, above.

Summary of changes:
 etc/ChangeLog    |    5 +++++
 etc/post-receive |   10 +++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnus Project".

The branch, master has been updated


hooks/post-receive
-- 
Gnus Project