[X2go-Commits] buildscripts.git - master (branch) updated: d52afed8373ccb31a84089cf2dc0676ca7a3ec0a

X2go dev team git-admin at x2go.org
Mon Jan 23 00:56:04 CET 2012


The branch, master has been updated
       via  d52afed8373ccb31a84089cf2dc0676ca7a3ec0a (commit)
       via  c66c5506234163ee7aa33ba4c47e8c0a549b4c78 (commit)
      from  146ca95e1971f3ddeb4819f22f1e97a07a659113 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d52afed8373ccb31a84089cf2dc0676ca7a3ec0a
Merge: c66c5506234163ee7aa33ba4c47e8c0a549b4c78 146ca95e1971f3ddeb4819f22f1e97a07a659113
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 23 00:55:35 2012 +0100

    Merge branch 'master' of ssh://code.x2go.org:32032/srv/git/code.x2go.org/buildscripts

commit c66c5506234163ee7aa33ba4c47e8c0a549b4c78
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jan 23 00:53:27 2012 +0100

    fix updatebuildmain

-----------------------------------------------------------------------

Summary of changes:
 bin/updatebuildmain |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/bin/updatebuildmain b/bin/updatebuildmain
index 1aca5e1..54c3544 100755
--- a/bin/updatebuildmain
+++ b/bin/updatebuildmain
@@ -30,6 +30,7 @@ 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
+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


hooks/post-receive
-- 
buildscripts.git (buildscripts upstream project)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "buildscripts.git" (buildscripts upstream project).




More information about the x2go-commits mailing list