create script for notifying new warnings

use Paulus' experimental gitk when checking on merge conflicts
cc lkml

diff --git a/build_msg b/build_msg
index c0b0b031f291baa02a69885caa4e183fe6e210b4..5c5273adc77662f2f7cd42cc10306eeff59c2c08 100755 (executable)
--- 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 (executable)
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 ba04ef592e9fb727fbc589405a143ca8efaadc25..48bb70302f46d3b30cb898b72c668065c3ac696f 100755 (executable)
--- 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."