diff options
| author | Jay Kamat <jaygkamat@gmail.com> | 2017-10-14 11:32:23 -0400 |
|---|---|---|
| committer | Jay Kamat <jaygkamat@gmail.com> | 2017-10-14 18:08:52 -0400 |
| commit | 4ff44eff7bb789cdde9db254f24feb92a8250c66 (patch) | |
| tree | 3fdcfc38fcb793252ed3bd89e292a8af09608f92 /scripts/setupcommon.py | |
| parent | ee3d7463f607126667ac8fe6d5a1248cab3e7967 (diff) | |
| download | qutebrowser-4ff44eff7bb789cdde9db254f24feb92a8250c66.tar.gz qutebrowser-4ff44eff7bb789cdde9db254f24feb92a8250c66.zip | |
Clean up logic for finding git hash
Also add implementation for release scripts as well
Diffstat (limited to 'scripts/setupcommon.py')
| -rw-r--r-- | scripts/setupcommon.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/setupcommon.py b/scripts/setupcommon.py index a2e4dfca9..1f85b225f 100644 --- a/scripts/setupcommon.py +++ b/scripts/setupcommon.py @@ -50,13 +50,14 @@ def _git_str(): if not os.path.isdir(os.path.join(BASEDIR, ".git")): return None try: - cid = subprocess.check_output( - ['git', 'describe', '--tags', '--dirty', '--always'], + # https://stackoverflow.com/questions/21017300/21017394#21017394 + commit_hash = subprocess.check_output( + ['git', 'describe', '--match=NeVeRmAtCh', '--always', '--dirty'], cwd=BASEDIR).decode('UTF-8').strip() date = subprocess.check_output( ['git', 'show', '-s', '--format=%ci', 'HEAD'], cwd=BASEDIR).decode('UTF-8').strip() - return '{} ({})'.format(cid, date) + return '{} ({})'.format(commit_hash, date) except (subprocess.CalledProcessError, OSError): return None |