Improve git_describe() (#2633)

Catch 'fatal: not a git repository' returns and return '' instead (observed in GCP Hub checks).
This commit is contained in:
Glenn Jocher authored and GitHub committed 2021-03-28 15:39:31 +02:00
1 parent 9b92d3ee76
commit 6e8c5b7678
1 file changed
+2 -1
+2 -1
View File
@@ -55,7 +55,8 @@ def git_describe(path=Path(__file__).parent): # path must be a directory
# return human-readable git description, i.e. v5.0-5-g3e25f1e https://git-scm.com/docs/git-describe
s = f'git -C {path} describe --tags --long --always'
try:
return subprocess.check_output(s, shell=True).decode()[:-1]
r = subprocess.check_output(s, shell=True).decode()[:-1]
return '' if r.startswith('fatal: not a git repository') else r
except subprocess.CalledProcessError as e:
return ''