Update TOpic to show dates for everybody.
Junio C Hamano committed
Feb 18, 2006 at 23:06 UTC
ba296ff54e6af9f93fbb097967cded3d4f40b7b7
1 file changed
+11
-7
TO
+11
-7
@@ -29,6 +29,7 @@ do
29
shift
30
done
31
32
+master_sha1=`git rev-parse --verify refs/heads/master`
33
LF='
34
'
35
(cd .git/refs/heads && find -type f) |
@@ -38,7 +39,12 @@ sed -n \
39
while read topic
40
do
41
rebase= done= not_done= trouble= date=
42
+ topic_sha1=`git rev-parse --verify "refs/heads/$topic"`
43
44
+ date=`
45
+ git-rev-list -1 --pretty "$topic" |
46
+ sed -ne 's/^Date: *\(.*\)/ (\1)/p'
47
+ `
48
# (1)
49
only_next_1=`git-rev-list ^master "^$topic" ${next} | sort`
50
only_next_2=`git-rev-list ^master ${next} | sort`
@@ -62,20 +68,18 @@ do
68
69
# (3)
70
not_in_next=`
65
- git-rev-list --pretty=oneline ^${next} "$topic"
71
+ git-rev-list --pretty=oneline ^${next} "$topic" |
72
+ sed -e 's/^[0-9a-f]* / - /'
73
`
74
if test -n "$not_in_next"
75
then
76
if test -n "$done"
77
then
78
+ # If $topic and master are the same,
79
+ # it is fine.
80
+ test "$master_sha1" = "$topic_sha1" ||
81
trouble="${LF}### MODIFIED AFTER COOKED ###"
82
fi
73
- last=`expr "$not_in_next" : '\([0-9a-f]*\) '`
74
- date=`
75
- git-rev-list -1 --pretty "$last" |
76
- sed -ne 's/^Date: *\(.*\)/ (\1)/p'
77
- `
78
- not_in_next=`echo "$not_in_next" | sed -e 's/^[0-9a-f]* / - /'`
83
not_done="${LF}Still not merged in ${next}$rebase.$LF$not_in_next"
84
elif test -n "$done"
85
then