Stone_Red/dvc
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/dvc.git synced 2026-11-10 15:28:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Saugat Pachhai
2020-08-20 13:47:19 +03:00
committed by GitHub
parent 9f1bd98fcc
commit 5d1ad03fe9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/func/test_install.py
+2 -2
View File
@@ -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"}