1
0
Fork 0

Merging upstream version 2.11.0.

Signed-off-by: Daniel Baumann <daniel@debian.org>
This commit is contained in:
Daniel Baumann 2025-02-09 21:25:27 +01:00
parent e1036806b7
commit b40b2e7e52
Signed by: daniel
GPG key ID: FBB4F0E80A80222F
33 changed files with 586 additions and 19 deletions

View file

@ -97,6 +97,7 @@ def test_run_legacy_recursive(tmpdir):
('pre-push', ['branch_name', 'remote_name']),
('commit-msg', ['.git/COMMIT_EDITMSG']),
('post-commit', []),
('post-merge', ['1']),
('post-checkout', ['old_head', 'new_head', '1']),
# multiple choices for commit-editmsg
('prepare-commit-msg', ['.git/COMMIT_EDITMSG']),
@ -157,6 +158,14 @@ def test_run_ns_post_commit():
assert ns.color is True
def test_run_ns_post_merge():
ns = hook_impl._run_ns('post-merge', True, ('1',), b'')
assert ns is not None
assert ns.hook_stage == 'post-merge'
assert ns.color is True
assert ns.is_squash_merge == '1'
def test_run_ns_post_checkout():
ns = hook_impl._run_ns('post-checkout', True, ('a', 'b', 'c'), b'')
assert ns is not None