From dea1ff8e8ce88840434d53977ff62683240f5b8f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 14 Jul 2022 15:16:19 +0200 Subject: Adding upstream version 2.20.0. Signed-off-by: Daniel Baumann --- testing/fixtures.py | 2 +- testing/util.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'testing') 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, -- cgit v1.2.3