cope with doing the merges and build on the same machine

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 10ba5cf33c8e7964a72596164aa6aad6b351793f..a3df8e5784ff976d4bee759bac91757c9e581cd3 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -176,7 +176,7 @@ for h in $heads; do
        do_build=$(grep -v '^#' $CTRL_FILE | awk -F '   ' '$3=="'$tree'" { print $6; }')
        [ "$do_build" = "yes" ] ||
                continue
-       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
                notify-send -t 0 -u critical "linux-next push failed for $tree!"
                pushover "linux-next push failed for $tree!"