From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 6 Jun 2018 21:39:07 +0000 (+1000)
Subject: do_merge: don't reset the branch stuff before checking for skipping
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=1817dc7945fd4fb03362c8f7f5d7ad74c26254ec;p=next-scripts

do_merge: don't reset the branch stuff before checking for skipping
---

diff --git a/do_merge b/do_merge
index 5aa414a..d1c52e7 100755
--- a/do_merge
+++ b/do_merge
@@ -98,11 +98,6 @@ need_build=false
 for h in $heads; do
 	tree=${h%%/*}
 
-	[ "$tree" = "branch" ] && {
-		git branch -f "${h#branch/}"
-		continue
-	}
-
 	[ -n "$start_from" ] && {
 		if [ "$tree" = "$start_from" ]; then
 			start_from=""
@@ -111,6 +106,11 @@ for h in $heads; do
 		fi
 	}
 
+	[ "$tree" = "branch" ] && {
+		git branch -f "${h#branch/}"
+		continue
+	}
+
 	hlog=$(git log -1 --oneline "${h/\/*://}") 2>/dev/null
 	old_head=$(git rev-parse HEAD)
 	[ -f "../pre-merge/$tree" ] && {