Import quilt trees into a clone and then fetch them

into the real tree

diff --git a/update_trees b/update_trees
index 182897ad6dc2737231af034456a0ac8d1a8476ba..895359bc4999586db7e2a823a441674cce26ba97 100755 (executable)
--- a/update_trees
+++ b/update_trees
@@ -86,18 +86,25 @@ for name in $quilters; do
                continue
        }
 
-       execute git checkout "quilt/$name"
+       rm -rf ../quilt-tmp
+       execute git clone -s -l -n -q . ../quilt-tmp
+       log '$' cd ../quilt-tmp
+       cd ../quilt-tmp
        execute git reset --hard "$rbase_sha1"
 
        author=$(grep -v '^#' ../real_control | awk -F '        ' '$3=="'"$name"'" { printf("%s", $1); }' | sed 's/,.*$//')
        execute git quiltimport --author "$author" --patches "../quilt/$name"
 
+       log '$' cd ../next
+       cd ../next
+
+       execute git fetch -f ../quilt-tmp master:"quilt/$name"
+       rm -rf ../quilt-tmp
+
        [ -f "$sfile.orig" ] &&
                mv -f "$sfile.orig" "$sfile"
 done
 
 ( cd ../quilt; git update-ref refs/heads/last_merge HEAD )
 
-git checkout master
-
 exit 0