projects
/
git.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eaf876c
)
WI and SA to keep track of maint branch as well
author
Junio C Hamano
<junkio@cox.net>
Fri, 21 Apr 2006 21:43:30 +0000
(14:43 -0700)
committer
Junio C Hamano
<junkio@cox.net>
Fri, 21 Apr 2006 21:43:30 +0000
(14:43 -0700)
SA
patch
|
blob
|
history
WI
patch
|
blob
|
history
diff --git
a/SA
b/SA
index
dd30ef8
..
b71be38
100755
(executable)
--- a/
SA
+++ b/
SA
@@
-3,3
+3,5
@@
# "What's in git.git" announcement, for the next round.
git tag -f sa/master refs/heads/master
# "What's in git.git" announcement, for the next round.
git tag -f sa/master refs/heads/master
+git tag -f sa/maint refs/heads/maint
+
diff --git
a/WI
b/WI
index
e86accd
..
6ddc1e4
100755
(executable)
--- a/
WI
+++ b/
WI
@@
-1,12
+1,24
@@
#!/bin/sh
# Prepare "What's in git.git"
#!/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)
echo "To: git@vger.kernel.org"
echo "Subject: What's in git.git"
master_at=$(git rev-parse --verify refs/heads/master)
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 "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
+ git log --no-merges $tagged heads/maint | git shortlog
+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"
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,14
+26,13
@@
then
echo
echo "* The 'master' branch has these since the last announcement."
echo
echo
echo "* The 'master' branch has these since the last announcement."
echo
- git log $tagged heads/master | git shortlog
+ 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
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
echo "* The 'next' branch, in addition, has these."
echo
git log --no-merges refs/heads/master..refs/heads/next | git shortlog
@@
-31,7
+42,6
@@
list=`git-rev-list ^refs/heads/master ^refs/heads/next refs/heads/pu 2>/dev/null
if test -n "$list"
then
echo
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
echo "* The 'pu' branch, in addition, has these."
echo
git log --no-merges ^refs/heads/master ^refs/heads/next refs/heads/pu | git shortlog