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

9
tests/git_test.py
View file

@ -141,6 +141,15 @@ def test_get_conflicted_files_unstaged_files(in_merge_conflict):
assert ret == {'conflict_file'}
def test_get_conflicted_files_with_file_named_head(in_merge_conflict):
resolve_conflict()
open('HEAD', 'w').close()
cmd_output('git', 'add', 'HEAD')
ret = set(git.get_conflicted_files())
assert ret == {'conflict_file', 'HEAD'}
MERGE_MSG = b"Merge branch 'foo' into bar\n\nConflicts:\n\tconflict_file\n"
OTHER_MERGE_MSG = MERGE_MSG + b'\tother_conflict_file\n'