From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Jun 2008 00:49:48 +0000 (+1000)
Subject: do nothing for empty series
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=ead2c9978a003257cf465196b4bddb0228037969;p=next-scripts

do nothing for empty series
---

diff --git a/update_trees b/update_trees
index 7cfab7f..bca7152 100755
--- a/update_trees
+++ b/update_trees
@@ -53,6 +53,16 @@ for name in $quilters; do
 		done <"$sfile.orig" >"$sfile"
 	}
 
+	mv -f "$sfile" "$sfile.tmp"
+	sed -e '/^[ 	]*$/d' -e '^[ 	]*#/d' <"$sfile.tmp" >"$sfile"
+	rm -f "$sfile.tmp"
+	[ -s "$sfile" ] || {
+		log "	quilt series is empty"
+		[ -f "$sfile.orig" ] &&
+			mv -f "$sfile.orig" "$sfile"
+		continue
+	}
+
 	execute git branch -D "quilt/$name"
 	execute git checkout -b "quilt/$name" "$rbase" || sh -i || {
 		[ -f "$sfile.orig" ] && mv -f $sfile.orig $sfile