From 34473245c4e92fe872a76d78763011d4da8801ee Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 18 Mar 2009 01:52:54 +1100 Subject: [PATCH] only create/remove quilt-tmp once --- update_trees | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/update_trees b/update_trees index 895359b..cad015e 100755 --- a/update_trees +++ b/update_trees @@ -86,8 +86,9 @@ for name in $quilters; do continue } - rm -rf ../quilt-tmp - execute git clone -s -l -n -q . ../quilt-tmp + [ -d "../quilt-tmp" ] || + execute git clone -s -l -n -q . ../quilt-tmp + log '$' cd ../quilt-tmp cd ../quilt-tmp execute git reset --hard "$rbase_sha1" @@ -99,12 +100,14 @@ for name in $quilters; do cd ../next execute git fetch -f ../quilt-tmp master:"quilt/$name" - rm -rf ../quilt-tmp [ -f "$sfile.orig" ] && mv -f "$sfile.orig" "$sfile" done +[ -d "../quilt-tmp" ] && + rm -rf ../quilt-tmp + ( cd ../quilt; git update-ref refs/heads/last_merge HEAD ) exit 0 -- 2.39.5