From f280995a847850327b1a156bfba2068966b1acec Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 21 Jan 2022 20:59:12 +0100 Subject: Merging upstream version 2.17.0. Signed-off-by: Daniel Baumann --- pre_commit/error_handler.py | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'pre_commit/error_handler.py') diff --git a/pre_commit/error_handler.py b/pre_commit/error_handler.py index 023dd35..7e74b95 100644 --- a/pre_commit/error_handler.py +++ b/pre_commit/error_handler.py @@ -9,6 +9,7 @@ import pre_commit.constants as C from pre_commit import output from pre_commit.errors import FatalError from pre_commit.store import Store +from pre_commit.util import cmd_output_b from pre_commit.util import force_bytes @@ -21,6 +22,9 @@ def _log_and_exit( error_msg = f'{msg}: {type(exc).__name__}: '.encode() + force_bytes(exc) output.write_line_b(error_msg) + _, git_version_b, _ = cmd_output_b('git', '--version', retcode=None) + git_version = git_version_b.decode(errors='backslashreplace').rstrip() + storedir = Store().directory log_path = os.path.join(storedir, 'pre-commit.log') with contextlib.ExitStack() as ctx: @@ -38,6 +42,7 @@ def _log_and_exit( _log_line() _log_line('```') _log_line(f'pre-commit version: {C.VERSION}') + _log_line(f'git --version: {git_version}') _log_line('sys.version:') for line in sys.version.splitlines(): _log_line(f' {line}') -- cgit v1.2.3