]> git.ozlabs.org Git - next-scripts/commitdiff
only create/remove quilt-tmp once
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Mar 2009 14:52:54 +0000 (01:52 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 17 Mar 2009 14:52:54 +0000 (01:52 +1100)
update_trees

index 895359bc4999586db7e2a823a441674cce26ba97..cad015e35300699d105ea98f03cbe197fec991e5 100755 (executable)
@@ -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