diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-14 13:16:23 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-07-14 13:16:23 +0000 |
| commit | eebab08ecd6c247fa464f40934f852d63daba9bb (patch) | |
| tree | ab61e7678c576d3489623464241ec67faf455964 /testing | |
| parent | Releasing debian version 2.19.0-1. (diff) | |
| download | pre-commit-eebab08ecd6c247fa464f40934f852d63daba9bb.tar.xz pre-commit-eebab08ecd6c247fa464f40934f852d63daba9bb.zip | |
Merging upstream version 2.20.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing')
| -rw-r--r-- | testing/fixtures.py | 2 | ||||
| -rw-r--r-- | testing/util.py | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/testing/fixtures.py b/testing/fixtures.py index ef5a041..5182a08 100644 --- a/testing/fixtures.py +++ b/testing/fixtures.py @@ -38,7 +38,7 @@ def copy_tree_to_path(src_dir, dest_dir): def git_dir(tempdir_factory): path = tempdir_factory.get() - cmd_output('git', 'init', path) + cmd_output('git', '-c', 'init.defaultBranch=master', 'init', path) return path diff --git a/testing/util.py b/testing/util.py index 0dd1784..e807f04 100644 --- a/testing/util.py +++ b/testing/util.py @@ -76,6 +76,8 @@ def run_opts( hook_stage='commit', show_diff_on_failure=False, commit_msg_filename='', + prepare_commit_message_source='', + commit_object_name='', checkout_type='', is_squash_merge='', rewrite_command='', @@ -97,6 +99,8 @@ def run_opts( hook_stage=hook_stage, show_diff_on_failure=show_diff_on_failure, commit_msg_filename=commit_msg_filename, + prepare_commit_message_source=prepare_commit_message_source, + commit_object_name=commit_object_name, checkout_type=checkout_type, is_squash_merge=is_squash_merge, rewrite_command=rewrite_command, |