update to_build_host a bit

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index c1bb89d9544ceecb56b1d84b109c9a6af0172233..4b9be3adcb2aa61b3045e61e81933036daf3a29f 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -32,10 +32,13 @@ git branch -f akpm/base HEAD
 old_head=$(git rev-parse HEAD)
 hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
 log Merging akpm-current/current "($hlog)"
-execute git merge akpm-current/current || {
+execute git merge --no-ff akpm-current/current || {
        echo Merge failed 1>&2
        echo $h >>../merge.debug
        git diff >>../merge.debug 2>&1
+
+       check_unmerged_files akpm-current
+
        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                bash -i || exit
        }
@@ -58,11 +61,11 @@ $no_build ||
        [ "$old_head" = "$new_head" ] ||
        [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-       git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
                echo git push failed 1>&2
                bash -i || exit
        }
-       "$bin_dir/do_build" || {
+       "$bin_dir/do_build" akpm-current || {
                echo Build failed 1>&2
                bash -i || exit
        }
@@ -83,6 +86,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
        bash -i || exit
 }
 echo "fix up?"
+linux-next-notify "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -116,11 +120,11 @@ $no_build ||
        [ "$old_head" = "$new_head" ] ||
        [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-       git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
                echo git push failed 1>&2
                bash -i || exit
        }
-       "$bin_dir/do_build" || {
+       "$bin_dir/do_build" akpm || {
                echo Build failed 1>&2
                bash -i || exit
        }