[PATCH] merge_msg: Gather the email addresses for the conflicting tree

[Mark Brown <broonie@kernel.org>]

We have a list of conflicting trees and the contacts file, do the lookup of
the contacts programatically. Skip doing so for the origin tree since it's
not generally too interesting to tell Linus about these things, and rely on
the sending MUA to deduplicate addresses.

Signed-off-by: Mark Brown <broonie@kernel.org>
---
 merge_msg | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/merge_msg b/merge_msg
index f781e0b..e95cbaa 100755
--- a/merge_msg
+++ b/merge_msg
@@ -46,6 +46,16 @@ if [ "${#hb[@]}" -gt 1 ]; then
 	hbs='s'
 fi
 
+# Rely on the sending MUA to dedupe
+for b in "${hb[@]}"; do
+	if [ "${b}" = "origin" ]; done
+		continue
+	fi
+	bc=$(../tools/get_contacts ${b})
+	IFS=',' read -r -a addrs <<< ${bc}
+	cc+=("${addrs[@]}")
+done
+
 printf -v subject 'manual merge of the BRANCH tree with the %s tree%s' \
 	"${hb[*]}" "$hbs"
 printf -v update 'The BRANCH tree acquired a conflict with the %s tree%s'. \
@@ -72,8 +82,7 @@ if [ "$#" -gt 1 ]; then
 fi
 
 "$tools_dir/message_helper" "${branch[@]}" "$subject" "${cc[@]}" <<EOF
-FIXME: Add owner of second tree to To:
-       Add author(s)/SOB of conflicting commits.
+FIXME: Add author(s)/SOB of conflicting commits.
 
 Today's linux-next merge of the BRANCH tree got $conf in:
 
-- 
2.47.3