dodoc: adjust to "git add ." complaints.

[git.git] / WI

diff --git a/WI b/WI
index 60ee92c..6ddc1e4 100755 (executable)
--- a/WI
+++ b/WI
@@ -1,22 +1,48 @@
 #!/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
+maint_at=$(git rev-parse --verify refs/heads/maint)
+master_at=$(git rev-parse --verify refs/heads/master)
 
-       list=`git-rev-list $in_addition $tagged heads/$m 2>/dev/null` &&
-       test -n "$list" || continue
+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"
 
-       echo "* The '$m' branch$has_msg"
+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
-       git log $in_addition $tagged heads/$m |
-       git shortlog
+       echo "* The 'maint' branch has these fixes since the last announcement."
        echo
+       git log --no-merges $tagged heads/maint | git shortlog
+fi
 
-       in_addition="$in_addition ^heads/$m"
-       has_msg=', in addition, has these.'
-done
+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
+       echo "* The 'master' branch has these since the last announcement."
+       echo
+       git log --no-merges $tagged heads/master | git shortlog
+fi
+
+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
+       git log --no-merges refs/heads/master..refs/heads/next | git shortlog
+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
+       git log --no-merges ^refs/heads/master ^refs/heads/next refs/heads/pu | git shortlog
+fi