mirror/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-01-14 21:10:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Add --no-textconv to git diff calls

Browse Source
This commit is contained in:
Adam Johnson
2023-02-02 11:02:58 +00:00
parent e846829992
commit 7783a3e63a
2 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pre_commit/commands/run.py
View File

@@ -272,7 +272,8 @@ def _all_filenames(args: argparse.Namespace) -> Collection[str]:
def _get_diff() -> bytes:
_, out, _ = cmd_output_b(
'git', 'diff', '--no-ext-diff', '--ignore-submodules', check=False,
'git', 'diff', '--no-ext-diff', '--no-textconv', '--ignore-submodules',
check=False,
)
return out
@@ -326,8 +327,7 @@ def _has_unmerged_paths() -> bool:
def _has_unstaged_config(config_file: str) -> bool:
retcode, _, _ = cmd_output_b(
'git', 'diff', '--no-ext-diff', '--exit-code', config_file,
check=False,
'git', 'diff', '--quiet', '--no-ext-diff', config_file, check=False,
)
# be explicit, other git errors don't mean it has an unstaged config.
return retcode == 1