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

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 5aa414a42113f6dfa15e38497aeb07b5437866df..d1c52e71dea8bf4ba672b21ed1cea5d416f0e778 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -98,11 +98,6 @@ need_build=false
 for h in $heads; do
        tree=${h%%/*}
 
-       [ "$tree" = "branch" ] && {
-               git branch -f "${h#branch/}"
-               continue
-       }
-
        [ -n "$start_from" ] && {
                if [ "$tree" = "$start_from" ]; then
                        start_from=""
@@ -111,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" ] && {