Merge pull request #94115 from Zorvalt/fix-git-timestamp-with-show-signature

SCons: Fix build fetching `git_timestamp` if git `log.showsignature=true`
This commit is contained in:
Rémi Verschelde 2024-07-09 16:47:26 +02:00
commit b4943e16e1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 1 additions and 1 deletions

View File

@ -268,7 +268,7 @@ def get_version_info(module_version_string="", silent=False):
if os.path.exists(".git"):
try:
version_info["git_timestamp"] = subprocess.check_output(
["git", "log", "-1", "--pretty=format:%ct", githash]
["git", "log", "-1", "--pretty=format:%ct", "--no-show-signature", githash]
).decode("utf-8")
except (subprocess.CalledProcessError, OSError):
# `git` not found in PATH.