fix(commit): avoid warnings with 'always_signoff' configuration

AdrianDC · Lee-W · commit 18e4928bdcfc · 2024-11-16T15:58:40.000+08:00
Signed-off-by: Adrian DC &lt;radian.dc@gmail.com&gt;
diff --git a/commitizen/commands/commit.py b/commitizen/commands/commit.py
@@ -134,16 +134,17 @@ def __call__(self):
         if dry_run:
             raise DryRunExit()
 
-        signoff: bool = (
-            self.arguments.get("signoff") or self.config.settings["always_signoff"]
-        )
+        always_signoff: bool = self.config.settings["always_signoff"]
+        signoff: bool = self.arguments.get("signoff")
 
         extra_args = self.arguments.get("extra_cli_args", "")
 
         if signoff:
             out.warn(
                 "signoff mechanic is deprecated, please use `cz commit -- -s` instead."
             )
+
+        if always_signoff or signoff:
             extra_args = f"{extra_args} -s".strip()
 
         c = git.commit(m, args=extra_args)
