X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=WI;h=fa0d9f8ca1258ecd2d785209295ab25a0bf1a8ba;hb=39b4cb198b0cec9b564b74ec2b40a5840da4cda2;hp=e86accdae08a40834683fb487ad67332459a1f6a;hpb=f8ab671134121663f27a75f64e941a40d2a3bff1;p=git.git

diff --git a/WI b/WI
index e86accda..fa0d9f8c 100755
--- a/WI
+++ b/WI
@@ -1,12 +1,30 @@
 #!/bin/sh
 # Prepare "What's in git.git"
 
+maint_at=$(git rev-parse --verify refs/heads/maint)
 master_at=$(git rev-parse --verify refs/heads/master)
 
+log () {
+	git log --no-merges "$@" |
+	git shortlog |
+	perl -pe 'if (!/^    / && !/^$/) { s/^/   / }'
+}
+
 echo "To: git@vger.kernel.org"
 echo "Subject: What's in git.git"
+echo "X-maint-at: $maint_at"
 echo "X-master-at: $master_at"
 
+tagged=`git rev-parse --not --verify tags/sa/maint`
+list=`git-rev-list $tagged refs/heads/maint 2>/dev/null`
+if test -n "$list"
+then
+	echo
+	echo "* The 'maint' branch has these fixes since the last announcement."
+	echo
+	log $tagged heads/maint
+fi
+
 tagged=`git rev-parse --not --verify tags/sa/master`
 list=`git-rev-list $tagged refs/heads/master 2>/dev/null`
 if test -n "$list"
@@ -14,25 +32,23 @@ then
 	echo
 	echo "* The 'master' branch has these since the last announcement."
 	echo
-	git log $tagged heads/master | git shortlog
+	log $tagged heads/master
 fi
 
 list=`git-rev-list refs/heads/master..refs/heads/next 2>/dev/null`
 if test -n "$list"
 then
 	echo
-	echo
 	echo "* The 'next' branch, in addition, has these."
 	echo
-	git log --no-merges refs/heads/master..refs/heads/next | git shortlog
+	log heads/master..heads/next ^heads/cleannext
 fi
 
 list=`git-rev-list ^refs/heads/master ^refs/heads/next refs/heads/pu 2>/dev/null`
 if test -n "$list"
 then
 	echo
-	echo
 	echo "* The 'pu' branch, in addition, has these."
 	echo
-	git log --no-merges ^refs/heads/master ^refs/heads/next refs/heads/pu | git shortlog
+	log ^heads/master heads/next..heads/pu
 fi