Unified Diff: packager.py
Issue 29904555:
Issue 7004 - Actually return git's result (Closed)
Patch Set:
Created Oct. 8, 2018, 1:22 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: packager.py |
| diff --git a/packager.py b/packager.py |
| index ab9557148de8834951ea1ea93e83c55a0be18cf9..f559d938eea5b66aab8be2f20416add73168bda5 100644 |
| --- a/packager.py |
| +++ b/packager.py |
| @@ -72,8 +72,11 @@ def getBuildNum(baseDir): |
| result = subprocess.check_output(['hg', 'id', '-R', baseDir, '-n']) |
| return re.sub(r'\D', '', result) |
| elif Git().istype(baseDir): |
| - result = subprocess.check_output(['git', 'rev-list', 'HEAD'], cwd=baseDir) |
| - return str(len(result.splitlines())) |
| + result = subprocess.check_output( |
| + ['git', 'rev-list', '--count', '--branches', '--tags'], |
| + cwd=baseDir, |
| + ) |
| + return re.sub(r'\D', '', result) |
|
Sebastian Noack
2018/10/08 13:28:25
Wouldn't strip() do?
tlucas
2018/10/08 13:35:28
It does :) Done.
|
| except subprocess.CalledProcessError: |
| pass |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
