From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 1 Jun 2018 04:47:54 +0000 (+1000)
Subject: set branches based on "branch" points in the control file
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=a16f3bdd0f860b9fc418f6f42b1244e2350a4a00;p=next-scripts

set branches based on "branch" points in the control file
---

diff --git a/do_merge b/do_merge
index 8293401..5aa414a 100755
--- a/do_merge
+++ b/do_merge
@@ -91,13 +91,18 @@ do_rebase()
 
 }
 
-heads=$(grep -v '^#' "$CTRL_FILE" | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
+heads=$(grep -v '^#' "$CTRL_FILE" | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); } $2=="branch" { printf("branch/%s ", $1); }')
 
 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=""
diff --git a/make_tree_file b/make_tree_file
index 7e5d682..c144ccc 100755
--- a/make_tree_file
+++ b/make_tree_file
@@ -30,6 +30,7 @@ mkdir Next
 	IFS='	'
 	grep -v '^#' $CTRL_FILE |
 		while read email type name url ref build; do
+			[ "$type" = "branch" ] && continue
 			tab="\t"
 			[ ${#name} -le 8 ] && tab="\t\t"
 			[ "$type" = "git" ] && url="$url#${ref##*:}"