Announce, WI and SA updates.

Announce

@@ -18,9 +18,12 @@ master)
 	kind="feature" ;;
 esac
 
-fmt -64 <<EOF
+echo "To: git@vger.kernel.org
+cc: linux-kernel@vger.kernel.org
 Subject: [ANNOUNCE] GIT $vername
+"
 
+fmt -64 <<EOF
 The latest $kind release GIT $vername is available at the usual places:
 
 	http://www.kernel.org/pub/software/scm/git/

SA

@@ -2,5 +2,4 @@
 # Take a snapshot of master and next *after* making an
 # "What's in git.git" announcement, for the next round.
 
-git tag -f sa/next   refs/heads/next
 git tag -f sa/master refs/heads/master

WI

@@ -1,22 +1,35 @@
 #!/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` ||
-	test "$m" != pu || exit
+echo "To: git@vger.kernel.org"
+echo "Subject: What's in git.git"
 
-	list=`git-rev-list $in_addition $tagged heads/$m 2>/dev/null` &&
-	test -n "$list" || continue
+tagged=`git rev-parse --not --verify tags/sa/master`
+list=`git-rev-list $tagged heads/master 2>/dev/null`
+if test -n "$list"
+then
+	echo
+	echo "* The 'master' branch has these since the last announcement."
+	echo
+	git log $tagged heads/master | git shortlog
+fi
 
-	echo "* The '$m' branch$has_msg"
+list=`git-rev-list heads/master..heads/next 2>/dev/null`
+if test -n "$list"
+then
+	echo
 	echo
-	git log $in_addition $tagged heads/$m |
-	git shortlog
+	echo "* The 'next' branch, in addition, has these."
 	echo
+	git log --no-merges heads/master..heads/next | git shortlog
+fi
 
-	in_addition="$in_addition ^heads/$m"
-	has_msg=', in addition, has these.'
-done
+list=`git-rev-list ^heads/master ^heads/next 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 ^heads/master ^heads/next heads/pu | git shortlog
+fi