From 7fc728705df723b3dfc59f66dd9d81d6bae97aa2 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 14 Aug 2015 14:39:04 +1000
Subject: [PATCH] various tidy ups for the message production

---
 build_warn     |  5 +++++
 merge_msg      | 15 +++++----------
 message_helper |  2 +-
 send_email     |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build_warn b/build_warn
index 6883477..e4c4ac5 100755
--- a/build_warn
+++ b/build_warn
@@ -4,6 +4,11 @@ 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 (KCONFIG_NAME) produced this warning:
+
+
+Introduced by commit
+
+   ("")
 EOF
 
 exit 0
diff --git a/merge_msg b/merge_msg
index e6e8752..e5d80ec 100755
--- a/merge_msg
+++ b/merge_msg
@@ -6,17 +6,13 @@ branch=""
         shift 2
 }
 
-file="$*"
-
-gitk --merge -- $file &
-[ "$file" ] && gvim $file 2>/dev/null
+gitk --merge -- "$@" &
+[ "$#" ] && gvim "$@" 2>/dev/null
 
+printf -v files "  %s\n" "$@"
 conf="a conflict"
-[ "$#" -gt 1 ] && {
-	file=${file// /, }
-	file=$(echo $file | sed 's/,\([^,]*\)$/ and\1/')
+[ "$#" -gt 1 ] &&
 	conf="conflicts"
-}
 
 subject="manual merge of the BRANCH tree with the FIXME tree"
 
@@ -26,8 +22,7 @@ FIXME: Add owner of second tree to To:
 
 Today's linux-next merge of the BRANCH tree got $conf in:
 
-  $file
-
+$files
 between commit:
 
    ("")
diff --git a/message_helper b/message_helper
index fa3644c..a181ef6 100755
--- a/message_helper
+++ b/message_helper
@@ -35,7 +35,7 @@ subject="${1//BRANCH/$branch}"
 filter="sed -e \"s/BRANCH/$branch/g\""
 [ "$kconfig" ] &&
 	filter="$filter -e \"s/KCONFIG_NAME/$kconfig/g\""
-filter="$filter | fmt"
+filter="$filter | fmt -s"
 
 $(dirname $0)/send_email "$contact" "$cc" "linux-next: $subject" <<EOF
 Hi $greeting,
diff --git a/send_email b/send_email
index 475a953..60842a7 100755
--- a/send_email
+++ b/send_email
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-TARGET="$(dirname $0)/../mails"/$(date +"%Y-%m-%d+%s").email
+TARGET="$(realpath --relative-to=. $(dirname $0)/../mails)"/$(date +"%Y-%m-%d+%s").email
 
 to="$1"
 cc="$2"
-- 
2.39.5