Merging upstream version 4.8.2.

Signed-off-by: Daniel Baumann <daniel@debian.org>

tests/commands/test_changelog_command/test_changelog_command_shows_description_when_use_help_option.txt

@@ -3,7 +3,7 @@ usage: cz changelog [-h] [--dry-run] [--file-name FILE_NAME]
                     [--start-rev START_REV] [--merge-prerelease]
                     [--version-scheme {pep440,semver,semver2}]
                     [--export-template EXPORT_TEMPLATE] [--template TEMPLATE]
-                    [--extra EXTRA]
+                    [--extra EXTRA] [--tag-format TAG_FORMAT]
                     [rev_range]
 
 generate changelog (note that it will overwrite existing file)
@@ -37,3 +37,5 @@ options:
                         changelog template file name (relative to the current
                         working directory)
   --extra, -e EXTRA     a changelog extra variable (in the form 'key=value')
+  --tag-format TAG_FORMAT
+                        The format of the tag, wrap around simple quotes

tests/test_changelog.py

@@ -556,8 +556,8 @@ TAGS = [
 
 
 @pytest.fixture
-def gitcommits() -> list:
-    commits = [
+def gitcommits() -> list[git.GitCommit]:
+    return [
         git.GitCommit(
             commit["rev"],
             commit["title"],
@@ -568,13 +568,11 @@ def gitcommits() -> list:
         )
         for commit in COMMITS_DATA
     ]
-    return commits
 
 
 @pytest.fixture
-def tags() -> list:
-    tags = [git.GitTag(*tag) for tag in TAGS]
-    return tags
+def tags() -> list[git.GitTag]:
+    return [git.GitTag(*tag) for tag in TAGS]
 
 
 @pytest.fixture