diff options
| author | X2go Administrator <x2go-admin@minobo.das-netzwerkteam.de> | 2012-01-18 22:11:31 +0100 |
|---|---|---|
| committer | X2go Administrator <x2go-admin@minobo.das-netzwerkteam.de> | 2012-01-18 22:11:31 +0100 |
| commit | eca903fceb335913fa641b30cdf7973daa4ee93a (patch) | |
| tree | f741c047a83a30a5eca624f110905d877fc72fb6 /bin/updatebuildmain | |
| parent | 8ce1824780bb0c77df4e351009bdb5d1a5610651 (diff) | |
| parent | 28dea91c42a72f04cb8e5c727626bc6b29895706 (diff) | |
| download | buildscripts-eca903fceb335913fa641b30cdf7973daa4ee93a.tar.gz buildscripts-eca903fceb335913fa641b30cdf7973daa4ee93a.tar.bz2 buildscripts-eca903fceb335913fa641b30cdf7973daa4ee93a.zip | |
Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/buildscripts
Diffstat (limited to 'bin/updatebuildmain')
| -rwxr-xr-x | bin/updatebuildmain | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/updatebuildmain b/bin/updatebuildmain index f4f4917..1aca5e1 100755 --- a/bin/updatebuildmain +++ b/bin/updatebuildmain @@ -20,7 +20,7 @@ set -e GITPROJECT=$(basename $(pwd)) -REF=$1 +REF=${1-HEAD} # we need to be within a working copy (base folder) and we need a <REF>!!! test -z $1 || test -d ./.git || { @@ -30,5 +30,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 branch build-main &>/dev/null || true git push origin $REF:build-main |