fix(git): ignore invalid utf8

GitGuardian · Nov 2, 2021 · 31849a8 · 31849a8
1 parent 4bac36d
commit 31849a8
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/ggshield/git_shell.py b/ggshield/git_shell.py
@@ -90,13 +90,15 @@ def shell(command: List[str], timeout: int = COMMAND_TIMEOUT) -> str:
             stderr=subprocess.PIPE,
             timeout=timeout,
         )
-        return result.stdout.decode("utf-8").rstrip()
+        return result.stdout.decode("utf-8", errors="ignore").rstrip()
     except subprocess.CalledProcessError:
         pass
     except subprocess.TimeoutExpired:
         raise click.Abort('Command "{}" timed out'.format(" ".join(command)))
     except Exception as exc:
-        raise click.ClickException(f"Unhandled exception: {str(exc)}")
+        raise click.ClickException(
+            f"Unhandled exception: {' '.join(command)}\n\t{str(exc)}"
+        )
 
     return ""