Fix getGitVersion showing a clean repo as modified

This commit is contained in:
Jacob Welsh 2014-08-24 17:44:39 -05:00
parent 4896de5ee4
commit 490148fe5c
1 changed files with 2 additions and 4 deletions

View File

@ -377,9 +377,9 @@ def getGitVersion(tagPrefix):
# any uncommitted modifications?
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:
if line[:2] != '??':
if line != '' and line[:2] != '??':
modified = True
break
@ -558,5 +558,3 @@ class MergeTestCommand(Command):
def finalize_options(self):
pass