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

Adding upstream version 2.13.0.

Browse source 
Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 21:27:56 +01:00
parent 9a762b409f
commit af2c814963
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
27 changed files with 1249 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/conftest.py
View file

@ -90,8 +90,8 @@ def _make_conflict():
@pytest.fixture
def in_merge_conflict(tempdir_factory):
path = make_consuming_repo(tempdir_factory, 'script_hooks_repo')
open(os.path.join(path, 'dummy'), 'a').close()
cmd_output('git', 'add', 'dummy', cwd=path)
open(os.path.join(path, 'placeholder'), 'a').close()
cmd_output('git', 'add', 'placeholder', cwd=path)
git_commit(msg=in_merge_conflict.__name__, cwd=path)
conflict_path = tempdir_factory.get()