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

[X2go dev team]

The branch, master has been updated
       via  d079d87d600c82022c2659341662a22c76095611 (commit)
      from  0374acf263de19a8e68c7dd4c31769fabaa46159 (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 d079d87d600c82022c2659341662a22c76095611
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 18:15:55 2011 +0200

    enforcing another reset --hard after pulling the refspec

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

Summary of changes:
 bin/x2go-build-package |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

The diff of changes is:
diff --git a/bin/x2go-build-package b/bin/x2go-build-package
index 3492f50..88a1174 100755
--- a/bin/x2go-build-package
+++ b/bin/x2go-build-package
@@ -108,6 +108,8 @@ prepare_workspace() {
 		cd $PROJECT_DIR && git reset --hard
 		git checkout --force $CHECKOUT || git checkout --force -b $CHECKOUT
 		git pull origin $CHECKOUT
+		# and again, get the $CHECKOUT refspec in pure state
+		git reset --hard
 	else
 		cd $(dirname $PROJECT_DIR)
 		git clone git://code.x2go.org/$PROJECT.git


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).