cope with doing the merges and build on the same machine

[next-scripts] / merge_old_version

diff --git a/merge_old_version b/merge_old_version
index 5465ab51028a352fdb31e190026743e56ae41512..99ffa84f2cb164af13015aaff121539856326e80 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -95,7 +95,7 @@ printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE
 
 $no_build && exit 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
 }