cope with doing the merges and build on the same machine

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index 6f3f0705efd4b496f1abe26b0fef2ede82aa6c5e..f3181dd0b6d1b87452de8a0480adc6eb63c27fb5 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -64,7 +64,7 @@ $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
        }
@@ -123,7 +123,7 @@ $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
        }