8000 FIX: Escape asterisk in ``git describe`` call on Windows by DancingQuanta · Pull Request #262 · python-versioneer/python-versioneer · GitHub
[go: up one dir, main page]
Skip to content

FIX: Escape asterisk in git describe call on Windows #262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 11, 2021
Merged

FIX: Escape asterisk in git describe call on Windows #262

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8ed4ce7
A fix for tag prefix match on Windows
DancingQuanta Aug 23, 2021
a4fbe3b
AAdded flakes8 ignore flag for \*
DancingQuanta Aug 31, 2021
8c97417
Use raw string for prefix regex
DancingQuanta Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/git/from_vcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
version string, meaning we're inside a checked out source tree.
"""
GITS = ["git"]
TAG_PREFIX_REGEX = "*"
if sys.platform == "win32":
GITS = ["git.cmd", "git.exe"]
TAG_PREFIX_REGEX = r"\*"

_, rc = runner(GITS, ["rev-parse", "--git-dir"], cwd=root,
hide_stderr=True)
Expand All @@ -36,7 +38,8 @@ def git_pieces_from_vcs(tag_prefix, root, verbose, runner=run_command):
# if there isn't one, this yields HEX[-dirty] (no NUM)
describe_out, rc = runner(GITS, ["describe", "--tags", "--dirty",
"--always", "--long",
"--match", "%s*" % tag_prefix],
"--match",
"%s%s" % (tag_prefix, TAG_PREFIX_REGEX)],
cwd=root)
# --long was added in git-1.5.5
if describe_out is None:
Expand Down
0