ASCEE/pyqtgraph
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #93 from welshjf/develop

Browse Source 
Fix getGitVersion showing a clean repo as modified
This commit is contained in:
Luke Campagnola 2014-08-29 21:31:37 -04:00
commit c1f5c1bf66
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/setupHelpers.py
View File

@ -377,9 +377,9 @@ def getGitVersion(tagPrefix):
# any uncommitted modifications? # any uncommitted modifications?
modified = False modified = False
status = check_output(['git', 'status', '-s'], universal_newlines=True).strip().split('\n') status = check_output(['git', 'status', '--porcelain'], universal_newlines=True).strip().split('\n')
for line in status: for line in status:
if line[:2] != '??': if line != '' and line[:2] != '??':
modified = True modified = True
break break
@ -558,5 +558,3 @@ class MergeTestCommand(Command):
def finalize_options(self): def finalize_options(self):
pass pass