diff options
Diffstat (limited to 'tests/component/rpm/test_import_orig_rpm.py')
| -rw-r--r-- | tests/component/rpm/test_import_orig_rpm.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/component/rpm/test_import_orig_rpm.py b/tests/component/rpm/test_import_orig_rpm.py index c27601db..5ed41c61 100644 --- a/tests/component/rpm/test_import_orig_rpm.py +++ b/tests/component/rpm/test_import_orig_rpm.py @@ -222,6 +222,10 @@ class TestImportOrig(ImportOrigTestBase): def test_misc_options(self): """Test various options of git-import-orig-rpm""" repo = ComponentTestGitRepository.create('.') + # Force --no-ff for merges because default behavior is slightly + # different in newer git versions (> 2.16) + repo.set_config("branch.pack.mergeoptions", "--no-ff") + # Import one orig with default options to get upstream and # packaging branch orig = os.path.join(DATA_DIR, 'gbp-test-1.0.tar.bz2') |