git/pre-commit
1
0
Fork 0
Code Issues Activity

Adding upstream version 3.0.4.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 21:37:06 +01:00
parent 2ba952a000
commit 4066ef5157
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
4 changed files with 53 additions and 4 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