cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to ffe0f2f
Date Fri, 08 Aug 2014 17:22:37 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master d33278250 -> ffe0f2f60


appliance: use the right way to get git branch name

Taken from Junio C Hamano's blog [1], git's maintainer, he must not be wrong :)

[1] http://git-blame.blogspot.ch/2013/06/checking-current-branch-programatically.html

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e16414e56d8f398f8ddbbde89d3ee833582b8bb2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ffe0f2f6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ffe0f2f6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ffe0f2f6

Branch: refs/heads/master
Commit: ffe0f2f60f664482f4b5fdb52b33eb45f0b25d88
Parents: d332782
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Fri Aug 8 19:18:32 2014 +0200
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Aug 8 19:22:20 2014 +0200

----------------------------------------------------------------------
 tools/appliance/build.sh | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ffe0f2f6/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 13e7c84..d377cc5 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -31,12 +31,9 @@ build_date=`date +%Y-%m-%d`
 branch=
 
 if [ -z "$branch" ] ; then
-  branch=$(git rev-parse --abbrev-ref HEAD)
+  branch=`git symbolic-ref --short -q HEAD 2>/dev/null || echo unknown`
 fi
 
-if [ -z "$branch" ] ; then
-    branch=unknown
-fi
 rootdir=$PWD
 
 # Initialize veewee and dependencies


Mime
View raw message