Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-03-09 21:37:12 +00:00
commit 25ec655162

View File

@ -77,7 +77,7 @@ def get_git_version(repo_dir='.', check_dir='.'):
return git_describe.stdout.strip() return git_describe.stdout.strip()
else: else:
cli.args.warn(f'"{" ".join(git_describe_cmd)}" returned error code {git_describe.returncode}') cli.log.warn(f'"{" ".join(git_describe_cmd)}" returned error code {git_describe.returncode}')
print(git_describe.stderr) print(git_describe.stderr)
return strftime(time_fmt) return strftime(time_fmt)