From bd08fec857804cd3441b349954852fc0b50f9928 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 18 Mar 2009 02:09:20 +1100
Subject: [PATCH] simple tidy ups

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

diff --git a/update_trees b/update_trees
index cad015e..b224f24 100755
--- 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" ] &&
-- 
2.39.5