From 6f9a3d2cd2320398a1f0c42ebf6c137bc9df76d7 Mon Sep 17 00:00:00 2001
From: Yu-Ting Hsiung <bear890707@gmail.com>
Date: Tue, 10 Jun 2025 12:25:24 +0800
Subject: [PATCH 1/2] refactor(Init): fix unbounded variable in _ask_tag_format

---
 commitizen/commands/init.py | 23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/commitizen/commands/init.py b/commitizen/commands/init.py
index 1207cd02e..3f3ac0a69 100644
--- a/commitizen/commands/init.py
+++ b/commitizen/commands/init.py
@@ -208,23 +208,20 @@ def _ask_tag(self) -> str:
         return latest_tag
 
     def _ask_tag_format(self, latest_tag: str) -> str:
-        is_correct_format = False
         if latest_tag.startswith("v"):
-            tag_format = r"v$version"
-            is_correct_format = questionary.confirm(
-                f'Is "{tag_format}" the correct tag format?', style=self.cz.style
-            ).unsafe_ask()
+            v_tag_format = r"v$version"
+            if questionary.confirm(
+                f'Is "{v_tag_format}" the correct tag format?', style=self.cz.style
+            ).unsafe_ask():
+                return v_tag_format
 
         default_format = DEFAULT_SETTINGS["tag_format"]
-        if not is_correct_format:
-            tag_format = questionary.text(
-                f'Please enter the correct version format: (default: "{default_format}")',
-                style=self.cz.style,
-            ).unsafe_ask()
+        tag_format: str = questionary.text(
+            f'Please enter the correct version format: (default: "{default_format}")',
+            style=self.cz.style,
+        ).unsafe_ask()
 
-            if not tag_format:
-                tag_format = default_format
-        return tag_format
+        return tag_format or default_format
 
     def _ask_version_provider(self) -> str:
         """Ask for setting: version_provider"""

From ae143dbaba645d3f663c1d339b1ba471cd69093c Mon Sep 17 00:00:00 2001
From: Yu-Ting Hsiung <bear890707@gmail.com>
Date: Tue, 10 Jun 2025 13:22:44 +0800
Subject: [PATCH 2/2] test(Init): improve coverage for _ask_tag_format

---
 tests/commands/test_init_command.py | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/tests/commands/test_init_command.py b/tests/commands/test_init_command.py
index 3f12d0bd7..2d39ae085 100644
--- a/tests/commands/test_init_command.py
+++ b/tests/commands/test_init_command.py
@@ -255,6 +255,38 @@ def test_pre_commit_exec_failed(
                 commands.Init(config)()
 
 
+class TestAskTagFormat:
+    def test_confirm_v_tag_format(self, mocker: MockFixture, config):
+        init = commands.Init(config)
+        mocker.patch("questionary.confirm", return_value=FakeQuestion(True))
+
+        result = init._ask_tag_format("v1.0.0")
+        assert result == r"v$version"
+
+    def test_reject_v_tag_format(self, mocker: MockFixture, config):
+        init = commands.Init(config)
+        mocker.patch("questionary.confirm", return_value=FakeQuestion(False))
+        mocker.patch("questionary.text", return_value=FakeQuestion("custom-$version"))
+
+        result = init._ask_tag_format("v1.0.0")
+        assert result == "custom-$version"
+
+    def test_non_v_tag_format(self, mocker: MockFixture, config):
+        init = commands.Init(config)
+        mocker.patch("questionary.text", return_value=FakeQuestion("custom-$version"))
+
+        result = init._ask_tag_format("1.0.0")
+        assert result == "custom-$version"
+
+    def test_empty_input_returns_default(self, mocker: MockFixture, config):
+        init = commands.Init(config)
+        mocker.patch("questionary.confirm", return_value=FakeQuestion(False))
+        mocker.patch("questionary.text", return_value=FakeQuestion(""))
+
+        result = init._ask_tag_format("v1.0.0")
+        assert result == "$version"  # This is the default format from DEFAULT_SETTINGS
+
+
 @skip_below_py_3_10
 def test_init_command_shows_description_when_use_help_option(
     mocker: MockFixture, capsys, file_regression