simple tidy ups

diff --git a/update_trees b/update_trees
index cad015e35300699d105ea98f03cbe197fec991e5..b224f24c1fc3fc71650c7d1420a622b2c8d0b201 100755 (executable)
--- a/update_trees
+++ b/update_trees
@@ -75,13 +75,10 @@ for name in $quilters; do
        git show-ref --quiet --verify "refs/heads/quilt/$name" ||
                execute git branch "quilt/$name" "$rbase_sha1"
 
-       mv -f "$sfile" "$sfile.tmp"
-       sed -e '/^[     ]*$/d' -e '/^[  ]*#/d' <"$sfile.tmp" >"$sfile"
-       rm -f "$sfile.tmp"
+       sed -i -e '/^[  ]*$/d' -e '/^[  ]*#/d' "$sfile"
        [ -s "$sfile" ] || {
                log "   quilt series is empty"
-               [ -f "$sfile.orig" ] &&
-                       mv -f "$sfile.orig" "$sfile"
+               mv -f "$sfile.orig" "$sfile"
                execute git update-ref "refs/heads/quilt/$name" "$rbase_sha1"
                continue
        }
@@ -101,8 +98,7 @@ for name in $quilters; do
 
        execute git fetch -f ../quilt-tmp master:"quilt/$name"
 
-       [ -f "$sfile.orig" ] &&
-               mv -f "$sfile.orig" "$sfile"
+       mv -f "$sfile.orig" "$sfile"
 done
 
 [ -d "../quilt-tmp" ] &&