diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-06-29 22:25:06 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-06-29 22:25:06 +0200 |
| commit | 29049bd9b11c428d93957030951c81497f37cd97 (patch) | |
| tree | 22acf11369604c1d4dc2ea2266e752790d36c705 /bin | |
| parent | 401c50405a8c0d739fb55f4296b37484290c83c0 (diff) | |
| download | buildscripts-29049bd9b11c428d93957030951c81497f37cd97.tar.gz buildscripts-29049bd9b11c428d93957030951c81497f37cd97.tar.bz2 buildscripts-29049bd9b11c428d93957030951c81497f37cd97.zip | |
fix updatebuildmain, add flexible origin repos as $2
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/updatebuildmain | 6 |
1 files changed, 4 insertions, 2 deletions
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 <REF>!!! 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 |