Add xtensa tree

cope with stgit's base spec

diff --git a/update_trees b/update_trees
index b336d73119bce2bedc0ed089135ad7d8dabd8ef4..182897ad6dc2737231af034456a0ac8d1a8476ba 100755 (executable)
--- 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