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"
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