Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6E760200AC8 for ; Mon, 23 May 2016 21:57:15 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 6D39E160A24; Mon, 23 May 2016 19:57:15 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id B51C6160A2B for ; Mon, 23 May 2016 21:57:14 +0200 (CEST) Received: (qmail 86430 invoked by uid 500); 23 May 2016 19:57:13 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 86404 invoked by uid 99); 23 May 2016 19:57:13 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 May 2016 19:57:13 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7B575DFADE; Mon, 23 May 2016 19:57:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sarowe@apache.org To: commits@lucene.apache.org Date: Mon, 23 May 2016 19:57:16 -0000 Message-Id: In-Reply-To: <2ba73f8abc17487ca88cfbe21d003cf4@git.apache.org> References: <2ba73f8abc17487ca88cfbe21d003cf4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/6] lucene-solr:branch_6_0: Fix current branch detection archived-at: Mon, 23 May 2016 19:57:15 -0000 Fix current branch detection Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/9568ac42 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/9568ac42 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/9568ac42 Branch: refs/heads/branch_6_0 Commit: 9568ac4238e1334233cc6efb7c71e72a3d2fbb58 Parents: b57f753 Author: Steve Rowe Authored: Mon May 23 15:44:11 2016 -0400 Committer: Steve Rowe Committed: Mon May 23 15:44:11 2016 -0400 ---------------------------------------------------------------------- dev-tools/scripts/buildAndPushRelease.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/9568ac42/dev-tools/scripts/buildAndPushRelease.py ---------------------------------------------------------------------- diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py index 1f4837a..f1a7759 100644 --- a/dev-tools/scripts/buildAndPushRelease.py +++ b/dev-tools/scripts/buildAndPushRelease.py @@ -61,7 +61,7 @@ def getGitRev(): status = os.popen('git status').read().strip() if 'nothing to commit, working directory clean' not in status: raise RuntimeError('git clone is dirty:\n\n%s' % status) - branch = os.popen('git rev-parse --abbrev-ref HEAD') + branch = os.popen('git rev-parse --abbrev-ref HEAD').read().strip() unpushedCommits = os.popen('git log origin/%s..' % branch).read().strip() if len(unpushedCommits) > 0: raise RuntimeError('There are unpushed commits - "git log origin.." output is:\n\n%s' % unpushedCommits)