@matheusbsbs / matheus-bagliano / commits / a525de7ea7
Fork 0

A bit more commenting and cleaning up.

Junio C Hamano committed May 9, 2006 at 13:01 UTC a525de7ea7186eaa4de41fff492725153fc536df
1 file changed +6 -7
check-topic-merges
+6 -7
@@ -1,13 +1,13 @@
1 #!/bin/sh
2 +#
3 +# Run this script _after_ making a proposed merge into a copy of
4 +# the target branch (e.g. "master") to see if it contains unrelated
5 +# merging back from the upstream.
6 +#
7 F=`git diff-tree -r --name-only HEAD^ HEAD`
8 echo "The topic modifies these paths:"
9 echo "$F" | sed -e 's/^/ /'
10
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 |
@@ -15,7 +15,7 @@ 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
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"
@@ -27,4 +27,3 @@ do
27 echo "$out" ;;
28 esac
29 done
30 -