From c82f482ef35406feada3068d7d0e5a0e467030a7 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 20 Jan 2009 11:18:32 +1100
Subject: [PATCH] Import quilt trees into a clone and then fetch them into the
 real tree

---
 update_trees | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/update_trees b/update_trees
index 182897a..895359b 100755
--- 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
-- 
2.39.5