paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 14:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

try_git_describe: Set cwd, not --git-dir.

Browse Source 
git describe --dirty requires a working tree, not just a repository.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
This commit is contained in:
Anders Kaseorg
2019-02-28 21:14:54 +00:00
committed by Tim Abbott
parent 9962377018
commit 88e90d34b9
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/logging_handlers.py
View File

@@ -18,10 +18,9 @@ from version import ZULIP_VERSION
def try_git_describe() -> Optional[str]: def try_git_describe() -> Optional[str]:
try: # nocoverage try: # nocoverage
return subprocess.check_output( return subprocess.check_output(
['git', ['git', 'describe', '--tags', '--always', '--dirty', '--long'],
'--git-dir', os.path.join(os.path.dirname(__file__), '../.git'),
'describe', '--tags', '--always', '--dirty', '--long'],
stderr=subprocess.PIPE, stderr=subprocess.PIPE,
cwd=os.path.join(os.path.dirname(__file__), '..'),
).strip().decode('utf-8') ).strip().decode('utf-8')
except Exception: # nocoverage except Exception: # nocoverage
return None return None