fix(commands/commit): use return_code to raise commit error, not stderr

Author: woile

commitizen/commands/commit.py

@@ -75,7 +75,7 @@ def __call__(self):
 
         c = git.commit(m)
 
-        if c.err:
+        if c.return_code != 0:
             out.error(c.err)
 
             # Create commit backup
@@ -86,10 +86,9 @@ def __call__(self):
 
         if "nothing added" in c.out or "no changes added to commit" in c.out:
             out.error(c.out)
-        elif c.err:
-            out.error(c.err)
         else:
             with contextlib.suppress(FileNotFoundError):
                 os.remove(self.temp_file)
+            out.write(c.err)
             out.write(c.out)
             out.success("Commit successful!")

tests/commands/test_commit_command.py

@@ -65,7 +65,7 @@ def test_commit_retry_works(config, mocker):
     }
 
     commit_mock = mocker.patch("commitizen.git.commit")
-    commit_mock.return_value = cmd.Command("", "error", "", "", 0)
+    commit_mock.return_value = cmd.Command("", "error", "", "", 9)
     error_mock = mocker.patch("commitizen.out.error")
 
     with pytest.raises(CommitError):