third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 16:24:40 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix _has_unstaged_config false negative check report

Browse source
This commit is contained in:
v.kapitonov 2023-11-11 09:36:01 +03:00
parent 14169eb31d
commit fcbee7e6f2
2 changed files with 90 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
pre_commit/commands/run.py
View file

@ -327,9 +327,18 @@ def _has_unmerged_paths() -> bool:
def _has_unstaged_config(config_file: str) -> bool:
retcode, _, _ = cmd_output_b(
'git', 'diff', '--quiet', '--no-ext-diff', config_file, check=False,
)
retcode = 0
if os.path.islink(config_file):
real_config_file = os.path.realpath(config_file)
_, is_real_file_in_git_dir, _, = cmd_output_b(
'git', 'ls-files', config_file,
)
if is_real_file_in_git_dir:
cmd = ('git', 'diff', '--quiet', '--no-ext-diff', real_config_file)
retcode, _, _ = cmd_output_b(*cmd, check=False)
else:
cmd = ('git', 'diff', '--quiet', '--no-ext-diff', config_file)
retcode, _, _ = cmd_output_b(*cmd, check=False)
# be explicit, other git errors don't mean it has an unstaged config.
return retcode == 1