Merge pull request #17 from ioben/topic/fix-13

Support git tags with backslacks
mtkennerly · Apr 27, 2021 · 1e929b2 · 1e929b2
2 parents 22cdbfc + 11d8600
commit 1e929b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/dunamai/__init__.py b/dunamai/__init__.py
@@ -498,7 +498,7 @@ def from_git(cls, pattern: str = _VERSION_PATTERN, latest_tag: bool = False) ->
                 dirty = True
 
         code, msg = _run_cmd(
-            'git for-each-ref "refs/tags/*" --merged HEAD'
+            'git for-each-ref "refs/tags/**" --merged HEAD'
             ' --format "%(refname)'
             "@{%(objectname)"
             "@{%(creatordate:iso-strict)"

diff --git a/tests/integration/test_dunamai.py b/tests/integration/test_dunamai.py
@@ -100,6 +100,10 @@ def test__version__from_git__with_annotated_tags(tmp_path) -> None:
         assert from_explicit_vcs(Vcs.Git) == Version("0.1.0", commit="abc", dirty=False)
         assert run("dunamai from any --bump") == "0.1.1"
 
+        # Verify tags with '/' work
+        run("git tag test/v0.1.0")
+        assert run(r'dunamai from any --pattern "^test/v(?P<base>\d\.\d\.\d)"') == "0.1.0"
+
         (vcs / "foo.txt").write_text("bye")
         assert from_vcs() == Version("0.1.0", commit="abc", dirty=True)