fix: improve bad tag handling

Author: mbdevpl

test/test_git.py

@@ -80,6 +80,17 @@ def test_nonversion_tags(self):
         version.local = (f'git{self.repo_head_hexsha}',)
         self.assertEqual(version, upcoming_version)
 
+    def test_too_short_version_tag(self):
+        self.git_commit_new_file()
+        self.repo.create_tag('v1.0')
+        self.git_commit_new_file()
+        self.repo.create_tag('v')
+        self.git_commit_new_file()
+        self.repo.create_tag('ver')
+        current_version = query_git_repo(self.repo_path)
+        _LOG.debug('current version is %s', current_version)
+        self.assertEqual(current_version.to_str(), '1.0')
+
     @unittest.skipUnless(
         os.environ.get('TEST_LONG') or os.environ.get('CI'), 'skipping long test')
     def test_too_long_no_tag(self):

version_query/git_query.py

@@ -14,9 +14,13 @@
 
 def preprocess_git_version_tag(tag: str):
     """Remove a prefix from a version tag."""
-    if tag.startswith('ver') and len(tag) > 3:
+    if tag.startswith('ver'):
+        if len(tag) == 3:
+            raise ValueError(f'the tag "{tag}" does not contain any version information')
         return tag[3:]
-    if tag.startswith('v') and len(tag) > 1:
+    if tag.startswith('v'):
+        if len(tag) == 1:
+            raise ValueError(f'the tag "{tag}" does not contain any version information')
         return tag[1:]
     if tag and tag[0] in ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9'):
         return tag
@@ -26,8 +30,6 @@ def preprocess_git_version_tag(tag: str):
 def _git_version_tags(repo: git.Repo) -> t.Mapping[git.Tag, Version]:
     versions = {}
     for tag in repo.tags:
-        if tag.name is None or not tag.name:
-            continue
         try:
             tag_str = preprocess_git_version_tag(tag.name)
         except ValueError: