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

Merging upstream version 4.2.0.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-03-20 08:17:16 +01:00
parent f3d71e86d5
commit 4f187f2e34
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
9 changed files with 121 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pre_commit/git.py
View file

@ -126,7 +126,7 @@ def get_conflicted_files() -> set[str]:
merge_diff_filenames = zsplit(
cmd_output(
'git', 'diff', '--name-only', '--no-ext-diff', '-z',
'-m', tree_hash, 'HEAD', 'MERGE_HEAD',
'-m', tree_hash, 'HEAD', 'MERGE_HEAD', '--',
)[1],
)
return set(merge_conflict_filenames) | set(merge_diff_filenames)