diff options
| author | David Lechner <david@pybricks.com> | 2021-07-05 10:37:34 -0500 |
|---|---|---|
| committer | David Lechner <david@pybricks.com> | 2021-07-05 10:41:31 -0500 |
| commit | d934f8c8a8bb896595a6b976126222b438f383ea (patch) | |
| tree | 7c59c5469df7d5dea4d397dfe91c22f88786c7b0 /py/makeversionhdr.py | |
| parent | 3966f67746abef0bf475003c7fe889648be38991 (diff) | |
py/makeversionhdr: Add --tags arg to git describe.
This adds the --tags argument to the git describe command that is used
to define the MICROPY_GIT_TAG macro. This makes it match non-annotated
tags. This is useful for MicroPython derivatives that don't use
annotated tags.
Signed-off-by: David Lechner <david@pybricks.com>
Diffstat (limited to 'py/makeversionhdr.py')
| -rw-r--r-- | py/makeversionhdr.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/py/makeversionhdr.py b/py/makeversionhdr.py index 2f4bc9182..54b7fa9ab 100644 --- a/py/makeversionhdr.py +++ b/py/makeversionhdr.py @@ -23,7 +23,7 @@ def get_version_info_from_git(): # Note: git describe doesn't work if no tag is available try: git_tag = subprocess.check_output( - ["git", "describe", "--dirty", "--always", "--match", "v[1-9].*"], + ["git", "describe", "--tags", "--dirty", "--always", "--match", "v[1-9].*"], stderr=subprocess.STDOUT, universal_newlines=True, ).strip() |