projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update TOpic to show dates for everybody.
[git.git]
/
TO
diff --git
a/TO
b/TO
index
6fb3924
..
1ac8fb8
100755
(executable)
--- a/
TO
+++ b/
TO
@@
-29,6
+29,7
@@
do
shift
done
shift
done
+master_sha1=`git rev-parse --verify refs/heads/master`
LF='
'
(cd .git/refs/heads && find -type f) |
LF='
'
(cd .git/refs/heads && find -type f) |
@@
-37,8
+38,13
@@
sed -n \
-e '/^[^\/][^\/]\//p' |
while read topic
do
-e '/^[^\/][^\/]\//p' |
while read topic
do
- rebase= done= not_done= trouble=
+ rebase= done= not_done= trouble= date=
+ topic_sha1=`git rev-parse --verify "refs/heads/$topic"`
+ date=`
+ git-rev-list -1 --pretty "$topic" |
+ sed -ne 's/^Date: *\(.*\)/ (\1)/p'
+ `
# (1)
only_next_1=`git-rev-list ^master "^$topic" ${next} | sort`
only_next_2=`git-rev-list ^master ${next} | sort`
# (1)
only_next_1=`git-rev-list ^master "^$topic" ${next} | sort`
only_next_2=`git-rev-list ^master ${next} | sort`
@@
-55,8
+61,7
@@
do
# (2)
not_in_master=`
# (2)
not_in_master=`
- git-rev-list --pretty=oneline ^master "$topic" |
- sed -e 's/^[0-9a-f]* //'
+ git-rev-list ^master "$topic"
`
test -z "$not_in_master" &&
done="${LF}Fully merged -- delete."
`
test -z "$not_in_master" &&
done="${LF}Fully merged -- delete."
@@
-70,6
+75,9
@@
do
then
if test -n "$done"
then
then
if test -n "$done"
then
+ # If $topic and master are the same,
+ # it is fine.
+ test "$master_sha1" = "$topic_sha1" ||
trouble="${LF}### MODIFIED AFTER COOKED ###"
fi
not_done="${LF}Still not merged in ${next}$rebase.$LF$not_in_next"
trouble="${LF}### MODIFIED AFTER COOKED ###"
fi
not_done="${LF}Still not merged in ${next}$rebase.$LF$not_in_next"
@@
-80,7
+88,7
@@
do
not_done="${LF}Up to date."
fi
not_done="${LF}Up to date."
fi
- echo "*** $topic ***$trouble$done$not_done"
+ echo "*** $topic ***$
date$
trouble$done$not_done"
if test -z "$trouble$not_done" &&
test -n "$done" &&
if test -z "$trouble$not_done" &&
test -n "$done" &&