various fixes

diff --git a/do_merge b/do_merge
index f018bd137a9001f0454d2c47c0b92ceec924c53b..44b90d7f65ec86fff754377b1e0d52d1d268478c 100755 (executable)
--- 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 3433b920dd3ae5c27b788bf6c4864cedb6f4d830..573dded5f885ce26bb14646beb0039fbe8074461 100755 (executable)
--- 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 618df5e4e37824a2eab0b129dd9438ce578e7615..2a1bec917ccec50ec8b205a9effa92c6ddc506f1 100755 (executable)
--- 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