From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 13 Aug 2025 07:11:18 +0000 (+1000)
Subject: do_merge: move the brnahc name for the branch OP to item 3
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=2969cf9a8696dc4ce1b2cfd2f1313fd4598646af;p=next-scripts

do_merge: move the brnahc name for the branch OP to item 3

So it matches the other types
---

diff --git a/do_merge b/do_merge
index 34bb2f7..c3e1785 100755
--- a/do_merge
+++ b/do_merge
@@ -71,7 +71,7 @@ fi
 heads=$(awk -F '\t' '
 	/^#/ { next; }
 	$2=="git" { printf("git/%s/%s ", $3, $5); }
-	$2=="branch" { printf("branch/%s ", $1); }
+	$2=="branch" { printf("branch/%s ", $3); }
 	$2=="switch" { printf("switch/%s/%s ", $3, $4); }' "$CTRL_FILE")
 
 need_build=false