From 686509b71299ead03c199af10534d9f6e0b8cf08 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 27 Jun 2008 17:57:17 +1000
Subject: [PATCH] various fixes

---
 do_merge     |  3 +--
 merge_msg    |  4 ++--
 update_trees | 12 +++++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/do_merge b/do_merge
index f018bd1..44b90d7 100755
--- a/do_merge
+++ b/do_merge
@@ -37,8 +37,7 @@ for h in $heads; do
 	execute git merge $h || {
 		echo Merge failed 1>&2
 		bash -i || exit
-		log '$' git commit -v -a
-		git commit -v -a
+		GIT_EDITOR=: execute git commit -v -a
 		execute git diff -M --stat --summary 'HEAD^..'
 	}
 	new_head=$(git rev-parse HEAD)
diff --git a/merge_msg b/merge_msg
index 3433b92..573dded 100755
--- a/merge_msg
+++ b/merge_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: manual merge of $branch tree&Body=Hi ,%0A\
+sylpheed --compose "mailto:$contact?Cc=linux-next@vger.kernel.org&Subject=linux-next: manual merge of the $branch tree&Body=Hi ,%0A\
 %0A\
-Today's linux-next merge of the $branch tree got a conflict in  between commit  ("") from the  tree and commit  ("") from the $branch tree."
+Today's linux-next merge of the $branch tree got a conflict in  between commit  (%22%22) from the  tree and commit  (%22%22) from the $branch tree."
diff --git a/update_trees b/update_trees
index 618df5e..2a1bec9 100755
--- a/update_trees
+++ b/update_trees
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cp /dev/null ../quilt-import.log
+#cp /dev/null ../quilt-import.log
 
 log()
 {
@@ -21,6 +21,14 @@ execute()
 quilters=$(grep -v '^#' ../real_control | awk -F '	' '$2=="quilt" { print $3; }')
 
 for name in $quilters; do
+
+	# don't bother importing things that haven't changed
+	change_size=$(cd ../quilt;git diff last_merge.. -- "$name/" | wc -c)
+	[ $change_size -eq 0 ] && {
+		log "Unchanged quilt series $name"
+		continue
+	}
+
 	sfile="../quilt/$name/series"
 	base=$(sed -n 's/^[# 	]*NEXT_BASE[ 	]*\(.*\)[ 	]*$/\1/p' "$sfile")
 	if [ -n "$base" ]; then
@@ -82,6 +90,8 @@ for name in $quilters; do
 		mv -f "$sfile.orig" "$sfile"
 done
 
+( cd ../quilt; git update-ref refs/heads/last_merge HEAD )
+
 git checkout master
 
 exit 0
-- 
2.39.5