merg_old_version: push even if not building

[next-scripts] / update_trees

diff --git a/update_trees b/update_trees
index d5c8697e96985c706b00bd458b1d2ae0b5a01c76..b09a01aa392458fe2db37a74d58853a2ab359471 100755 (executable)
--- a/update_trees
+++ b/update_trees
@@ -19,14 +19,14 @@ execute()
 
 cpwd=$(pwd)
 
-quilters=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '$2=="quilt" { print $3; }')
+quilters=$(awk -F '\t' '/^[^#]/ && $2=="quilt" { print $3; }' "$CTRL_FILE")
 
 for name in $quilters; do
 
        sfile="../quilt/$name/series"
        base=$(sed -n 's/^#[ \t]*NEXT[-_]BASE[ \t]*\([^ \t]*\)[ \t]*$/\1/p' "$sfile")
        if [ -n "$base" ]; then
-               nbase=$(grep -v '^#' $CTRL_FILE | awk -F '\t' '$3=="'"$base"'" { printf("%s/%s", "'"$base"'", $5); }')
+               nbase=$(awk -F '\t' '/^[^#]/ && $3=="'"$base"'" { printf("%s/%s", "'"$base"'", $5); }' "$CTRL_FILE")
                [ -n "$nbase" ] && base="$nbase"
        else
                base=$(sed -n 's/^#[ \t]*BASE[ \t]*\(.*\)[ \t]*$/\1/p' "$sfile")
@@ -83,7 +83,7 @@ for name in $quilters; do
 
        for f in $patches; do
                old_head=$(git rev-parse --verify HEAD)
-               execute git am --patch-format=mbox "../quilt/$name/$f"
+               execute git am -s --patch-format=mbox "../quilt/$name/$f"
                new_head=$(git rev-parse --verify HEAD)
                [ "$new_head" = "$old_head" ] && {
                        echo "Tree unchanged, please check ..."