From 195d16f18131ecfdbface936ea76c629daec809c Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 19 May 2009 18:31:11 +1000
Subject: [PATCH] create script for notifying new warnings use Paulus'
 experimental gitk when checking on merge conflicts cc lkml

---
 build_msg  |  2 +-
 build_warn | 16 ++++++++++++++++
 merge_msg  |  4 ++--
 3 files changed, 19 insertions(+), 3 deletions(-)
 create mode 100755 build_warn

diff --git a/build_msg b/build_msg
index c0b0b03..5c5273a 100755
--- a/build_msg
+++ b/build_msg
@@ -11,6 +11,6 @@ branch=${branch%%/*}
 
 contact=$(sed -n "/	$branch	/s/	.*$//p" $control)
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: $branch tree build failure&Body=Hi ,%0A\
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: $branch tree build failure&Body=Hi ,%0A\
 %0A\
 Today's linux-next build () failed like this:"
diff --git a/build_warn b/build_warn
new file mode 100755
index 0000000..65291f9
--- /dev/null
+++ b/build_warn
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+log=../merge.log
+[ -f merge.log ] && log=merge.log
+control=../real_control
+[ -f real_control ] && control=real_control
+
+branch=$(grep '^Merging ' $log | tail -1 | sed 's/^Merging //')
+branch=${branch#quilt/}
+branch=${branch%%/*}
+
+contact=$(sed -n "/	$branch	/s/	.*$//p" $control)
+
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: $branch tree build warning&Body=Hi ,%0A\
+%0A\
+Today's linux-next build () produced this warning:"
diff --git a/merge_msg b/merge_msg
index ba04ef5..48bb703 100755
--- a/merge_msg
+++ b/merge_msg
@@ -15,10 +15,10 @@ greeting=${contact%% *}
 
 file="$*"
 
-gitk --merge -- $file &
+gitk.test --merge -- $file &
 [ "$file" ] && gvim $file
 
-sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the  tree&Body=Hi $greeting,%0A\
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org,%20linux-kernel@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree with the  tree&Body=Hi $greeting,%0A\
 %0A\
 Today's linux-next merge of the $branch tree got a conflict in $file between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."
 
-- 
2.39.2