change the order of arguments to send_email

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index b0caba0b42a7043e6f0fb9dae340f0530f3e7ad1..ec55df978936098261efb35508a21f6bd13bb067 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -56,7 +56,7 @@ fi
 
 heads=$(awk -F '\t' '
        /^#/ { next; }
-       $2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }
+       $2=="git" { printf("%s/%s ", $3, $5); }
        $2=="branch" { printf("branch/%s ", $1); }' "$CTRL_FILE")
 
 need_build=false
@@ -74,7 +74,7 @@ for h in $heads; do
 
        if [ "$tree" = "branch" ]; then
                git branch -f "${h#branch/}"
-               linux-next-notify "update branch $1"
+               linux-next-notify "update branch ${h#branch/}"
                continue
        fi