diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-08 04:17:14 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2023-02-08 04:17:14 +0000 |
| commit | 638cb1489a90410c2e1502903c1a806c5ebe8587 (patch) | |
| tree | 5df02a4562e54b985b698b1974ce6d7219ffdf49 /pre_commit/commands/run.py | |
| parent | Releasing debian version 3.0.3-1. (diff) | |
| download | pre-commit-638cb1489a90410c2e1502903c1a806c5ebe8587.tar.xz pre-commit-638cb1489a90410c2e1502903c1a806c5ebe8587.zip | |
Merging upstream version 3.0.4.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'pre_commit/commands/run.py')
| -rw-r--r-- | pre_commit/commands/run.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pre_commit/commands/run.py b/pre_commit/commands/run.py index e44e703..a7eb4f4 100644 --- a/pre_commit/commands/run.py +++ b/pre_commit/commands/run.py @@ -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 |