Sort branches in TO script.
Junio C Hamano committed
May 9, 2006 at 12:55 UTC
6b9ffbebe7b83ac6a61c9477ab941d999f5d0c96
2 files changed
+31
TO
+1
index 996a5bab49..169f1fab29 100755
--- a/TO
+++ b/TO
@@ -36,6 +36,7 @@ LF='
sed -n \
-e 's/^\.\///' \
-e '/^[^\/][^\/]\//p' |
+sort |
while read topic
do
rebase= done= not_done= trouble= date=
check-topic-merges
+30
new file mode 100755
index 0000000000..1a3a96d471
--- /dev/null
+++ b/check-topic-merges
@@ -0,0 +1,30 @@
+#!/bin/sh
+F=`git diff-tree -r --name-only HEAD^ HEAD`
+echo "The topic modifies these paths:"
+echo "$F" | sed -e 's/^/ /'
+
+# Documentation/git-cvsexportcommit.txt
+# git-cvsexportcommit.perl
+# git-cvsserver.perl
+B=`git merge-base master HEAD`
+# 45f75a0167b4a4693f2c6005bf7db231ca91ecc8 (master)
+_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
+_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
+git rev-list --parents master..HEAD^2 |
+sed -ne "/^$_x40 $_x40 $_x40/p" |
+while read merge first second
+do
+ echo
+ # first is the previous cvs topic tip, second is what was merged into
+ # it. Does the merge have anything to do with adjust the topic to
+ # updated upstream?
+ git name-rev "$merge"
+ out=`git diff-tree --stat "$merge^" "$merge" -- $F`
+ case "$out" in
+ '')
+ echo "* Nothing to do with the topic" ;;
+ *)
+ echo "$out" ;;
+ esac
+done
+