From 4a6b58e9964431b240e50d9741162519d0fea430 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Fri, 12 Apr 2024 08:56:53 -0700 Subject: [PATCH] Don't add git hash to version if minor==0 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. --- version.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/version.py b/version.py index 2d9de6d5b..a3199f12c 100755 --- a/version.py +++ b/version.py @@ -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. @@ -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():