From aaa8ed93285d4110a0f367b89d6195c6eaebecfe Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Jul 2015 10:55:28 +1000
Subject: [PATCH] message_helper: substitute KCONFIG_NAME and put message
 through fmt

---
 build_msg      |  3 +--
 build_warn     |  3 +--
 merge_msg      |  3 +--
 message_helper | 16 ++++++++++++++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/build_msg b/build_msg
index f56db10..6df0061 100755
--- a/build_msg
+++ b/build_msg
@@ -3,8 +3,7 @@
 subject="build failure after merge of the BRANCH tree"
 
 $(dirname $0)/message_helper "$@" "$subject" <<EOF
-After merging the BRANCH tree, today's linux-next build (KCONFIG_NAME)
-failed like this:
+After merging the BRANCH tree, today's linux-next build (KCONFIG_NAME) failed like this:
 EOF
 
 exit 0
diff --git a/build_warn b/build_warn
index 17ab2aa..6883477 100755
--- a/build_warn
+++ b/build_warn
@@ -3,8 +3,7 @@
 subject="build warning after merge of the BRANCH tree"
 
 $(dirname $0)/message_helper "$@" "$subject" <<EOF
-After merging the BRANCH tree, today's linux-next build ()
-produced this warning:
+After merging the BRANCH tree, today's linux-next build (KCONFIG_NAME) produced this warning:
 EOF
 
 exit 0
diff --git a/merge_msg b/merge_msg
index 62227bd..e6e8752 100755
--- a/merge_msg
+++ b/merge_msg
@@ -38,8 +38,7 @@ from the FIXME tree and commit:
 
 from the BRANCH tree.
 
-I fixed it up (see below) and can carry the fix as necessary (no action
-is required).
+I fixed it up (see below) and can carry the fix as necessary (no action is required).
 EOF
 
 exit 0
diff --git a/message_helper b/message_helper
index 0b14b26..fa3644c 100755
--- a/message_helper
+++ b/message_helper
@@ -13,6 +13,14 @@ branch=""
         shift 2
 }
 
+kconfig=""
+[ "$1" = "-c" ] && {
+        kconfig=$2
+        shift 2
+}
+
+cc="linux-next@vger.kernel.org, linux-kernel@vger.kernel.org"
+
 [ "$branch" ] || {
 	branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //' | sed 's/ .*$//')
 	branch=${branch%%/*}
@@ -24,11 +32,15 @@ greeting=${greeting#\"}
 [ "${contact%,*}" = "${contact}" ] || greeting="all"
 
 subject="${1//BRANCH/$branch}"
+filter="sed -e \"s/BRANCH/$branch/g\""
+[ "$kconfig" ] &&
+	filter="$filter -e \"s/KCONFIG_NAME/$kconfig/g\""
+filter="$filter | fmt"
 
-$(dirname $0)/send_email "$contact" "linux-next@vger.kernel.org, linux-kernel@vger.kernel.org" "linux-next: $subject" <<EOF
+$(dirname $0)/send_email "$contact" "$cc" "linux-next: $subject" <<EOF
 Hi $greeting,
 
-$(sed "s/BRANCH/$branch/g")
+$(eval $filter)
 EOF
 
 exit 0
-- 
2.47.3