diff --git a/commitizen/commands/bump.py b/commitizen/commands/bump.py index 6084c8c15..ec1b9dee9 100644 --- a/commitizen/commands/bump.py +++ b/commitizen/commands/bump.py @@ -310,11 +310,14 @@ def __call__(self) -> None: changelog_file_name = None dry_run = self.arguments["dry_run"] if self.changelog_flag: + incremental_setting = self.config.settings.get("changelog_incremental") changelog_args = { "unreleased_version": new_tag_version, "template": self.template, "extras": self.extras, - "incremental": True, + "incremental": incremental_setting + if incremental_setting is not None + else True, "dry_run": dry_run, # governs logic for merge_prerelease "during_version_bump": self.arguments["prerelease"] is None, diff --git a/commitizen/defaults.py b/commitizen/defaults.py index 4865ccc18..cdf6238c6 100644 --- a/commitizen/defaults.py +++ b/commitizen/defaults.py @@ -38,7 +38,7 @@ class Settings(TypedDict, total=False): change_type_map: dict[str, str] changelog_file: str changelog_format: str | None - changelog_incremental: bool + changelog_incremental: bool | None changelog_merge_prerelease: bool changelog_start_rev: str | None customize: CzSettings @@ -100,7 +100,7 @@ class Settings(TypedDict, total=False): ], "changelog_file": "CHANGELOG.md", "changelog_format": None, # default guessed from changelog_file - "changelog_incremental": False, + "changelog_incremental": None, "changelog_start_rev": None, "changelog_merge_prerelease": False, "update_changelog_on_bump": False, diff --git a/tests/test_conf.py b/tests/test_conf.py index 923535e0c..fc7f5d4c6 100644 --- a/tests/test_conf.py +++ b/tests/test_conf.py @@ -97,7 +97,7 @@ "style": [["pointer", "reverse"], ["question", "underline"]], "changelog_file": "CHANGELOG.md", "changelog_format": None, - "changelog_incremental": False, + "changelog_incremental": None, "changelog_start_rev": None, "changelog_merge_prerelease": False, "update_changelog_on_bump": False, @@ -137,7 +137,7 @@ "style": [["pointer", "reverse"], ["question", "underline"]], "changelog_file": "CHANGELOG.md", "changelog_format": None, - "changelog_incremental": False, + "changelog_incremental": None, "changelog_start_rev": None, "changelog_merge_prerelease": False, "update_changelog_on_bump": False,