diff --git a/py/version.py b/py/version.py
index 04852af2d1ff5..b9e889b86b6ed 100755
--- a/py/version.py
+++ b/py/version.py
@@ -9,15 +9,17 @@ def get_version_info_from_git(repo_path, extra_args=[]):
# Note: git describe doesn't work if no tag is available
try:
git_tag = subprocess.check_output(
- # CIRCUITPY-CHANGE
+ # CIRCUITPY-CHANGE: Ignore MicroPython tags that start with v.
+ # Also ignore tags that are on merged in branches.
[
"git",
"describe",
"--dirty",
"--tags",
"--always",
+ "--first-parent",
"--match",
- "[1-9].*",
+ "[!v]*", # This is a glob, not a regex
*extra_args,
],
cwd=repo_path,
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy