git: do not ask for gpg signoff on merge (iterative#4430)

Marvellous1 · Aug 20, 2020 · 5d1ad03 · 5d1ad03
1 parent 9f1bd98
commit 5d1ad03
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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"}