Skip to content

Commit

Permalink
Don't add git hash to version if minor==0 (#409)
Browse files Browse the repository at this point in the history
This commit fixes a minor mistake from #392 where the previous perl
script had a special case that if the "minor" version was zero then the
git hash information wouldn't be printed.
  • Loading branch information
alexcrichton committed Apr 15, 2024
1 parent b4f426a commit 99abb02
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions version.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def parse_git_version(version):
next = parts.pop(0)
if next == 'm':
dirty = True
else:
elif minor != '0':
git = next[1:]

# Check: dirty.
Expand All @@ -53,10 +53,10 @@ def parse_git_version(version):

# Some inline tests to check Git version parsing:
assert parse_git_version(
'wasi-sdk-21-0-g317548590b40+m') == ('21', '0', '317548590b40', True)
'wasi-sdk-21-1-g317548590b40+m') == ('21', '1', '317548590b40', True)
assert parse_git_version('wasi-sdk-21-2+m') == ('21', '2', None, True)
assert parse_git_version(
'wasi-sdk-23-0-g317548590b40') == ('23', '0', '317548590b40', False)
'wasi-sdk-23-0-g317548590b40') == ('23', '0', None, False)


def git_version():
Expand Down

0 comments on commit 99abb02

Please sign in to comment.