[X2Go-Commits] [buildscripts] 01/02: bin/build-{rpm, deb}-package: fix detection of top commit on a branch (or tag)

git-admin at x2go.org git-admin at x2go.org
Thu Apr 30 19:27:48 CEST 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit ecb7c14ecaf18fec1e5cf13590f6f97dbfcf19db
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Apr 27 14:30:00 2015 +0200

    bin/build-{rpm,deb}-package: fix detection of top commit on a branch (or tag)
---
 bin/build-deb-package |    2 +-
 bin/build-rpm-package |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/build-deb-package b/bin/build-deb-package
index 30e0609..4dd07e8 100755
--- a/bin/build-deb-package
+++ b/bin/build-deb-package
@@ -139,7 +139,7 @@ prepare_workspace() {
 		git clean -df
 	fi
 
-	GIT_OBJECT_ID="$(git show-ref -s heads/master)"
+	GIT_OBJECT_ID="$(git rev-parse --verify HEAD)"
 	cd "${PROJECT_DIR}"
 
 	# by default we build for all current debian versions
diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index adb0291..1af3503 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -530,7 +530,7 @@ prepare_workspace() {
 		git clean -df
 	fi
 
-	GIT_OBJECT_ID="$(git show-ref -s heads/master)"
+	GIT_OBJECT_ID="$(git rev-parse --verify HEAD)"
 	cd "${PROJECT_DIR}"
 
 	if [ "x${ARGV2_CODENAME}" != "x" ]; then

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list