]> git.ozlabs.org Git - next-scripts/commitdiff
Set default base to oriing/master
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Jul 2008 07:49:50 +0000 (17:49 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 24 Jul 2008 07:49:50 +0000 (17:49 +1000)
update_trees

index 2a1bec917ccec50ec8b205a9effa92c6ddc506f1..b336d73119bce2bedc0ed089135ad7d8dabd8ef4 100755 (executable)
@@ -35,6 +35,8 @@ for name in $quilters; do
                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"
        fi
        rbase="$base"
        case "$base" in