From 5d1ad03fe9b81ece6af5384796fddcd7bd3e0c2d Mon Sep 17 00:00:00 2001 From: Saugat Pachhai Date: Thu, 20 Aug 2020 10:47:19 +0000 Subject: [PATCH] git: do not ask for gpg signoff on merge (#4430) --- tests/func/test_install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/func/test_install.py b/tests/func/test_install.py index 80be61214..eeef58d6f 100644 --- a/tests/func/test_install.py +++ b/tests/func/test_install.py @@ -84,7 +84,7 @@ def test_merge_driver_no_ancestor(tmp_dir, scm, dvc): scm.checkout("two", create_new=True) tmp_dir.dvc_gen({"data": {"bar": "bar"}}, commit="two: add data") - scm.repo.git.merge("one", m="merged") + scm.repo.git.merge("one", m="merged", no_gpg_sign=True, no_signoff=True) # NOTE: dvc shouldn't checkout automatically as it might take a long time assert (tmp_dir / "data").read_text() == {"bar": "bar"} @@ -114,7 +114,7 @@ def test_merge_driver(tmp_dir, scm, dvc): scm.checkout("two", create_new=True) tmp_dir.dvc_gen({"data": {"two": "two"}}, commit="two: add data") - scm.repo.git.merge("one", m="merged") + scm.repo.git.merge("one", m="merged", no_gpg_sign=True, no_signoff=True) # NOTE: dvc shouldn't checkout automatically as it might take a long time assert (tmp_dir / "data").read_text() == {"master": "master", "two": "two"}