X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=message_helper;h=3c450dd6ed6043d0e134ecb783cb9efc1492f563;hb=6f1a5a0e1639924c1b60c6525496d6820212fc2b;hp=a181ef6fe9f15f1818680c363874eb1763b882f1;hpb=7fc728705df723b3dfc59f66dd9d81d6bae97aa2;p=next-scripts

diff --git a/message_helper b/message_helper
index a181ef6..3c450dd 100755
--- a/message_helper
+++ b/message_helper
@@ -4,8 +4,6 @@
 
 log=$LOG_FILE
 [ -f merge.log ] && log=merge.log
-control=$CTRL_FILE
-[ -f control ] && control=control
 
 branch=""
 [ "$1" = "-t" ] && {
@@ -19,14 +17,14 @@ kconfig=""
         shift 2
 }
 
-cc="linux-next@vger.kernel.org, linux-kernel@vger.kernel.org"
+cc="Linux Next Mailing List <linux-next@vger.kernel.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>"
 
 [ "$branch" ] || {
 	branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
 	branch=${branch%%/*}
 }
 
-contact=$(awk -F '	' '$3=="'"$branch"'" { print $1; }' $control)
+contact=$(get_contacts "$branch")
 greeting=${contact%% *}
 greeting=${greeting#\"}
 [ "${contact%,*}" = "${contact}" ] || greeting="all"