From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Aug 2008 09:10:20 +0000 (+1000)
Subject: Add xtensa tree
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=5a721e7410754f07a54f86a58c0478040ad103d9;p=next-scripts

Add xtensa tree
cope with stgit's base spec
---

diff --git a/update_trees b/update_trees
index b336d73..182897a 100755
--- a/update_trees
+++ b/update_trees
@@ -30,13 +30,17 @@ for name in $quilters; do
 	}
 
 	sfile="../quilt/$name/series"
-	base=$(sed -n 's/^[# 	]*NEXT_BASE[ 	]*\(.*\)[ 	]*$/\1/p' "$sfile")
+	base=$(sed -n 's/^#[ 	]*NEXT_BASE[ 	]*\(.*\)[ 	]*$/\1/p' "$sfile")
 	if [ -n "$base" ]; then
 		base=$(grep -v '^#' ../real_control | awk -F '	' '$3=="'"$base"'" { if ($2=="quilt") printf("quilt/%s", "'"$base"'"); else printf("%s/%s", "'"$base"'", $5); }')
 	else
-		base=$(sed -n 's/^[# 	]*BASE[ 	]*\(.*\)[ 	]*$/\1/p' "$sfile")
-		[ -n "$base" ] ||
-			base="origin/master"
+		base=$(sed -n 's/^#[ 	]*BASE[ 	]*\(.*\)[ 	]*$/\1/p' "$sfile")
+		[ -n "$base" ] || {
+			# for stgit
+			base=$(sed '1{s/^#.*GIT commit \(.*\)$/\1/;q}' "$sfile")
+			[ -n "$base" ] ||
+				base="origin/master"
+		}
 	fi
 	rbase="$base"
 	case "$base" in