[08/14] lucene-solr:branch_5x: Check for unpushed commits only on the current branch

[sa...@apache.org]

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/7a101ee8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/7a101ee8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/7a101ee8

Branch: refs/heads/branch_5x
Commit: 7a101ee80dbbf4fa96be24054011078d89d2304c
Parents: a9e7727
Author: Steve Rowe <sa...@apache.org>
Authored: Mon May 23 15:40:44 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jun 21 00:03:34 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/7a101ee8/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)