Sort branches in TO script.
Junio C Hamano committed
May 9, 2006 at 12:55 UTC
6b9ffbebe7b83ac6a61c9477ab941d999f5d0c96
2 files changed
+31
TO
+1
@@ -36,6 +36,7 @@ LF='
36
sed -n \
37
-e 's/^\.\///' \
38
-e '/^[^\/][^\/]\//p' |
39
+sort |
40
while read topic
41
do
42
rebase= done= not_done= trouble= date=
check-topic-merges
new
+30
@@ -0,0 +1,30 @@
1
+#!/bin/sh
2
+F=`git diff-tree -r --name-only HEAD^ HEAD`
3
+echo "The topic modifies these paths:"
4
+echo "$F" | sed -e 's/^/ /'
5
+
6
+# Documentation/git-cvsexportcommit.txt
7
+# git-cvsexportcommit.perl
8
+# git-cvsserver.perl
9
+B=`git merge-base master HEAD`
10
+# 45f75a0167b4a4693f2c6005bf7db231ca91ecc8 (master)
11
+_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
12
+_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
13
+git rev-list --parents master..HEAD^2 |
14
+sed -ne "/^$_x40 $_x40 $_x40/p" |
15
+while read merge first second
16
+do
17
+ echo
18
+ # first is the previous cvs topic tip, second is what was merged into
19
+ # it. Does the merge have anything to do with adjust the topic to
20
+ # updated upstream?
21
+ git name-rev "$merge"
22
+ out=`git diff-tree --stat "$merge^" "$merge" -- $F`
23
+ case "$out" in
24
+ '')
25
+ echo "* Nothing to do with the topic" ;;
26
+ *)
27
+ echo "$out" ;;
28
+ esac
29
+done
30
+