change the order of arguments to send_email

[next-scripts] / make_tree_file

diff --git a/make_tree_file b/make_tree_file
index 7e5d682cd4e58b662ad00e92ac55742de0bdbfca..43473c27154955da4c09b5bcd957d680b996ff52 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -30,6 +30,7 @@ mkdir Next
        IFS='   '
        grep -v '^#' $CTRL_FILE |
                while read email type name url ref build; do
+                       [ "$type" = "branch" ] && continue
                        tab="\t"
                        [ ${#name} -le 8 ] && tab="\t\t"
                        [ "$type" = "git" ] && url="$url#${ref##*:}"
@@ -39,9 +40,7 @@ mkdir Next
 
 mv ../SHA1s Next/SHA1s
 
-for i in quilt-import.log merge.log; do
-       grep -v '^Checking out files:' ../$i >Next/$i
-done
+grep -v '^Checking out files:' ../merge.log >Next/merge.log
 
 printf -- "-next-%s\n" $d >localversion-next
 
@@ -77,4 +76,6 @@ cd ..
 xz -v -9 "$p"
 kup put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz"
 
+ssh -O exit git@gitolite.kernel.org
+
 exit 0