]> git.ozlabs.org Git - next-scripts/commitdiff
do_merge: move the brnahc name for the branch OP to item 3
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 13 Aug 2025 07:11:18 +0000 (17:11 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 13 Aug 2025 07:11:18 +0000 (17:11 +1000)
So it matches the other types

do_merge

index 34bb2f73f75ae8da342aeb865f094fef82388413..c3e1785bbdcec436b961922b2ee4cdc41b5b9831 100755 (executable)
--- 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