various fixes

[next-scripts] / update_trees

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