check_commits: check for unexpected files in commits

[next-scripts] / update_trees

diff --git a/update_trees b/update_trees
index 6841b5bc28d4a966be762830d04e8485f8bb52f7..b09a01aa392458fe2db37a74d58853a2ab359471 100755 (executable)
--- a/update_trees
+++ b/update_trees
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+. "$(dirname $0)/common.sh"
+
 log_file=../quilt-import.log
 #cp /dev/null $log_file
 
@@ -17,14 +19,14 @@ execute()
 
 cpwd=$(pwd)
 
-quilters=$(grep -v '^#' ../etc/control | 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 '^#' ../etc/control | 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")
@@ -37,7 +39,7 @@ for name in $quilters; do
        fi
        rbase="$base"
        case "$base" in
-       *-git[0-9]*)    rbase=$($(dirname $0)/get_gitid "${base}")
+       *-git[0-9]*)    rbase=$("$bin_dir/get_gitid" "${base}")
                        ;;
        commit*)        rbase=${base##commit*[[:space:]]}
                        ;;
@@ -81,7 +83,7 @@ for name in $quilters; do
 
        for f in $patches; do
                old_head=$(git rev-parse --verify HEAD)
-               execute git am "../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 ..."