Permalink
Browse files

Merge pull request #16 from mikegoodspeed/patch-1

update _git_version_git() to better parse `git branch`
  • Loading branch information...
2 parents ddcaaed + 46f00bb commit 4dbb3fef9875a826a0cbc1299c9832c18e7ff217 @mkleehammer committed Jan 1, 2014
Showing with 1 addition and 1 deletion.
  1. +1 −1 setup.py
View
@@ -291,7 +291,7 @@ def _get_version_git():
numbers[-2] += 1
name = '%s.%s.%s-beta%02d' % tuple(numbers)
- n, result = getoutput('git branch')
+ n, result = getoutput('git branch --color=never')
branch = re.search(r'\* (\w+)', result).group(1)
if branch != 'master' and not re.match('^v\d+$', branch):
name = branch + '-' + name

0 comments on commit 4dbb3fe

Please sign in to comment.