Repository: cloudstack
Updated Branches:
refs/heads/master a52a1cd4f -> a0006a699
appliance: change the way we find git branch in build.sh
(cherry picked from commit 493c0a68d2332cb9275902128c28f926a909f4ed)
Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
Conflicts:
tools/appliance/build.sh
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a0006a69
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a0006a69
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a0006a69
Branch: refs/heads/master
Commit: a0006a6990a8183f7bce609a37bdc7c6eedcd758
Parents: a52a1cd
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
Authored: Fri Aug 8 15:42:53 2014 +0200
Committer: Rohit Yadav <rohit.ya...@shapeblue.com>
Committed: Fri Aug 8 15:44:33 2014 +0200
----------------------------------------------------------------------
tools/appliance/build.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0006a69/tools/appliance/build.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh
index 61dee02..13e7c84 100755
--- a/tools/appliance/build.sh
+++ b/tools/appliance/build.sh
@@ -31,7 +31,7 @@ build_date=`date +%Y-%m-%d`
branch=
if [ -z "$branch" ] ; then
- branch=`git status | grep '# On branch' | awk '{print $4}'`
+ branch=$(git rev-parse --abbrev-ref HEAD)
fi
if [ -z "$branch" ] ; then
