X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=message_helper;fp=message_helper;h=d13360a7a22f02e818af672d9779e1f7923228ac;hb=e1b1448c210ddb68efc365fce049640243cd2bbd;hp=4224734bc19d0d9c39a592596537e2dd7328d8a7;hpb=aded3d9f8e83f652dddd6b5a1b0ffa206ccabfb1;p=next-scripts

diff --git a/message_helper b/message_helper
index 4224734..d13360a 100755
--- a/message_helper
+++ b/message_helper
@@ -20,8 +20,12 @@ if [ "$1" = '-c' ]; then
         shift 2
 fi
 
+subject="$1"
+shift
+
 cc=( 'Linux Next Mailing List <linux-next@vger.kernel.org>'
-	'Linux Kernel Mailing List <linux-kernel@vger.kernel.org>' )
+	'Linux Kernel Mailing List <linux-kernel@vger.kernel.org>'
+	"$@" )
 
 if [ -z "$branch" ]; then
 	branch=$(grep '^Merging ' "$log" | tail -n 1 |
@@ -29,15 +33,15 @@ if [ -z "$branch" ]; then
 fi
 
 contact=$(get_contacts "$branch")
-subject=${1//BRANCH/$branch}
-filter=( -e "s/BRANCH/$branch/g" )
+subject=${subject//BRANCH/$branch}
+filter=( -E -e 's/^([^ ])/|\1/' -e "s/BRANCH/$branch/g" )
 if [ -n "$kconfig" ]; then
 	filter+=( -e "s/KCONFIG_NAME/$kconfig/g" )
 fi
 
 {
 	printf 'Hi all,\n\n'
-	sed "${filter[@]}" | fmt -s
+	sed "${filter[@]}" | fmt -w 76 -u -p '|' | sed 's/^|//'
 } | "$bin_dir"/send_email "linux-next: $subject" "$contact" "${cc[@]}"
 
 exit 0