From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 4 Jun 2008 01:32:15 +0000 (+1000)
Subject: Create the branch earlier so that it exists even if it is empty
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=d09e6c007e4e4473ad45aec2a8c96a87d35cca58;p=next-scripts

Create the branch earlier so that it exists even if it is empty
---

diff --git a/update_trees b/update_trees
index c17428c..eef1286 100755
--- a/update_trees
+++ b/update_trees
@@ -53,6 +53,13 @@ for name in $quilters; do
 		done <"$sfile.orig" >"$sfile"
 	}
 
+	git show-ref --quiet --verify "refs/heads/quilt/$name" ||
+		execute git branch "quilt/$name" "$rbase" || sh -i || {
+			[ -f "$sfile.orig" ] &&
+				mv -f "$sfile.orig" "$sfile"
+			exit 1
+		}
+
 	mv -f "$sfile" "$sfile.tmp"
 	sed -e '/^[ 	]*$/d' -e '^[ 	]*#/d' <"$sfile.tmp" >"$sfile"
 	rm -f "$sfile.tmp"
@@ -63,12 +70,6 @@ for name in $quilters; do
 		continue
 	}
 
-	git show-ref --quiet --verify "refs/heads/quilt/$name" ||
-		execute git branch "quilt/$name" "$rbase" || sh -i || {
-			[ -f "$sfile.orig" ] &&
-				mv -f "$sfile.orig" "$sfile"
-			exit 1
-		}
 	execute git checkout "quilt/$name" || sh -i || {
 		[ -f "$sfile.orig" ] &&
 			mv -f "$sfile.orig" "$sfile"