You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2016/06/21 00:49:04 UTC
[07/13] lucene-solr:branch_5_5: Check for unpushed commits only on
the current branch
Check for unpushed commits only on the current branch
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/d9d3dae1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/d9d3dae1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/d9d3dae1
Branch: refs/heads/branch_5_5
Commit: d9d3dae14b2f49320f61c2ca88563608f9f85baa
Parents: 77b9246
Author: Steve Rowe <sa...@apache.org>
Authored: Mon May 23 15:40:44 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Jun 20 20:46:50 2016 -0400
----------------------------------------------------------------------
dev-tools/scripts/buildAndPushRelease.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/d9d3dae1/dev-tools/scripts/buildAndPushRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index 46be0fe..de50d32 100644
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -61,7 +61,8 @@ 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)
- unpushedCommits = os.popen('git log origin..').read().strip()
+ branch = os.popen('git rev-parse --abbrev-ref HEAD')
+ 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)