lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject [4/8] lucene-solr:master: Fix current branch detection
Date Tue, 24 May 2016 04:19:21 GMT
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/51f7574d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/51f7574d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/51f7574d

Branch: refs/heads/master
Commit: 51f7574d2f7f0aa6a396345d8b4f0f204da80dd4
Parents: ed893b3
Author: Steve Rowe <sarowe@apache.org>
Authored: Mon May 23 15:44:11 2016 -0400
Committer: Steve Rowe <sarowe@apache.org>
Committed: Tue May 24 00:17:31 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/51f7574d/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)


Mime
View raw message