import-akpm: use merge-files and merge-files for akpm-current

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 7b13a50edda2ce45e9f706f18bd6cac0d308f016..d1c52e71dea8bf4ba672b21ed1cea5d416f0e778 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -91,7 +91,7 @@ do_rebase()
 
 }
 
-heads=$(grep -v '^#' "$CTRL_FILE" | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
+heads=$(grep -v '^#' "$CTRL_FILE" | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); } $2=="branch" { printf("branch/%s ", $1); }')
 
 need_build=false
 
@@ -106,6 +106,11 @@ for h in $heads; do
                fi
        }
 
+       [ "$tree" = "branch" ] && {
+               git branch -f "${h#branch/}"
+               continue
+       }
+
        hlog=$(git log -1 --oneline "${h/\/*://}") 2>/dev/null
        old_head=$(git rev-parse HEAD)
        [ -f "../pre-merge/$tree" ] && {
@@ -191,7 +196,7 @@ for h in $heads; do
                        bash -i || exit
                }
        }
-       "$bin_dir/do_build" || {
+       "$bin_dir/do_build" "$tree" || {
                echo Build failed 1>&2
                notify-send -t 0 -u critical "linux-next build failed for $tree!"
                pushover "linux-next build failed for $tree!"