lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject [3/3] lucene-solr git commit: LUCENE-6938: fix buggy detection of dirty git checkout
Date Thu, 11 Feb 2016 15:23:17 GMT
LUCENE-6938: fix buggy detection of dirty git checkout


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/de9d4ac3
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/de9d4ac3
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/de9d4ac3

Branch: refs/heads/master
Commit: de9d4ac3b7370df8e3fd5418b7811ecb44c62998
Parents: f8be973
Author: Mike McCandless <mikemccand@apache.org>
Authored: Thu Feb 11 09:59:13 2016 -0500
Committer: Mike McCandless <mikemccand@apache.org>
Committed: Thu Feb 11 10:24:09 2016 -0500

----------------------------------------------------------------------
 dev-tools/scripts/buildAndPushRelease.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/de9d4ac3/dev-tools/scripts/buildAndPushRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/buildAndPushRelease.py b/dev-tools/scripts/buildAndPushRelease.py
index 68671a2..c735621 100644
--- a/dev-tools/scripts/buildAndPushRelease.py
+++ b/dev-tools/scripts/buildAndPushRelease.py
@@ -59,10 +59,8 @@ def runAndSendGPGPassword(command, password):
 
 def getGitRev():
   status = os.popen('git status').read().strip()
-  if 'Your branch is up-to-date' not in status:
-    raise RuntimeError('git clone has local changes:\n\n%s' % status)
-  if 'Untracked files' in status:
-    raise RuntimeError('there are untracked files; please run git clean -xfd:\n\n%s' % status)
+  if 'nothing to commit, working directory clean' not in status:
+    raise RuntimeError('git clone is dirty:\n\n%s' % status)
   return os.popen('git rev-parse HEAD').read().strip()
   
 


Mime
View raw message