X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=WI;h=fa0d9f8ca1258ecd2d785209295ab25a0bf1a8ba;hb=4efc984b38cfb6fd6cce3a37f136a47f9e424109;hp=c68e02de44d53c6f92e56728afa8657e1fc217df;hpb=0391212b73371b839c601079ef1393d6cd71868f;p=git.git

diff --git a/WI b/WI
index c68e02de..fa0d9f8c 100755
--- a/WI
+++ b/WI
@@ -1,20 +1,54 @@
 #!/bin/sh
 # Prepare "What's in git.git"
 
-has_msg=' has these since the last announcement.'
-in_addition=
-for m in master next pu
-do
-	tagged=`git rev-parse --not --verify tags/sa/$m 2>/dev/null`
-	list=`git-rev-list $in_addition $tagged heads/$m 2>/dev/null` &&
-	test -n "$list" || continue
+maint_at=$(git rev-parse --verify refs/heads/maint)
+master_at=$(git rev-parse --verify refs/heads/master)
 
-	echo "* The '$m' branch$has_msg"
+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"
+then
 	echo
-	git log $in_addition $tagged heads/$m |
-	git shortlog
+	echo "* The 'master' branch has these since the last announcement."
 	echo
+	log $tagged heads/master
+fi
 
-	in_addition="$in_addition ^heads/$m"
-	has_msg=', in addition, has these.'
-done
+list=`git-rev-list refs/heads/master..refs/heads/next 2>/dev/null`
+if test -n "$list"
+then
+	echo
+	echo "* The 'next' branch, in addition, has these."
+	echo
+	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 "* The 'pu' branch, in addition, has these."
+	echo
+	log ^heads/master heads/next..heads/pu
+fi