Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A966112D0 for ; Fri, 8 Aug 2014 13:45:13 +0000 (UTC) Received: (qmail 29859 invoked by uid 500); 8 Aug 2014 13:45:13 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 29828 invoked by uid 500); 8 Aug 2014 13:45:13 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 29819 invoked by uid 99); 8 Aug 2014 13:45:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Aug 2014 13:45:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id C829494CB6D; Fri, 8 Aug 2014 13:45:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Message-Id: <61a4a681e8964c6bad6d1e80a22b5ece@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to a0006a6 Date: Fri, 8 Aug 2014 13:45:12 +0000 (UTC) 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 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 Authored: Fri Aug 8 15:42:53 2014 +0200 Committer: Rohit Yadav 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