Merge branch 'master' of https://git.gnus.org/gnus

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6fd6ac9..60890a1 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-23  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * post-receive: Add log count to header.
+
 2010-09-02  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * post-receive: More subject formatting.

diff --git a/etc/post-receive b/etc/post-receive
index 0b307ea..d5fd8aa 100755 (executable)
--- a/etc/post-receive
+++ b/etc/post-receive
@@ -183,7 +183,7 @@ generate_email()
        # 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 join " ; ", @p') 2>/dev/null)
+               describe=$((git log --format="%s" $oldrev...$newrev | perl -e'@p = <>; chomp @p; print "=", scalar @p, "= ", join(" ; ", @p)') 2>/dev/null)
        fi
 
        if [ -z "$describe" ]; then