fix(cmd): improve character encoding detection for sub-commands

jenstroeger · jenstroeger · commit 943661771ffc · 2022-08-04T16:58:40.000+10:00
diff --git a/commitizen/cmd.py b/commitizen/cmd.py
@@ -12,6 +12,14 @@ class Command(NamedTuple):
     return_code: int
 
 
+def _try_decode(bytes_: bytes) -> str:
+    try:
+        return bytes_.decode("utf-8")
+    except UnicodeDecodeError:
+        result = chardet.detect(bytes_)
+        return bytes_.decode(result["encoding"] or "utf-8")
+
+
 def run(cmd: str) -> Command:
     process = subprocess.Popen(
         cmd,
@@ -23,8 +31,8 @@ def run(cmd: str) -> Command:
     stdout, stderr = process.communicate()
     return_code = process.returncode
     return Command(
-        stdout.decode(chardet.detect(stdout)["encoding"] or "utf-8"),
-        stderr.decode(chardet.detect(stderr)["encoding"] or "utf-8"),
+        _try_decode(stdout),
+        _try_decode(stderr),
         stdout,
         stderr,
         return_code,
