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

diff --git a/update_trees b/update_trees
index c17428c15734e0e47c0d01431ce3cbedb8457fae..eef12860513d5380eefbadd270e49b3922e37dce 100755 (executable)
--- 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"