From 29049bd9b11c428d93957030951c81497f37cd97 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Fri, 29 Jun 2012 22:25:06 +0200 Subject: fix updatebuildmain, add flexible origin repos as $2 --- bin/updatebuildmain | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/updatebuildmain b/bin/updatebuildmain index 54c3544..5a46ea4 100755 --- a/bin/updatebuildmain +++ b/bin/updatebuildmain @@ -21,6 +21,7 @@ set -e GITPROJECT=$(basename $(pwd)) REF=${1-HEAD} +ORIGIN=${2:-origin} # we need to be within a working copy (base folder) and we need a !!! test -z $1 || test -d ./.git || { @@ -32,5 +33,6 @@ test -z $1 || test -d ./.git || { # update the build-main branch with our newest blessed reference git branch -d build-main &>/dev/null || true git tag -d build-main &>/dev/null || true -git checkout -b build-main $REF -git push origin build-main:build-main +git checkout -b build-main $REF || true +git push $ORIGIN build-main:build-main +git checkout master -- cgit v1.2.3