tests: small fix for import-orig-rpm component test

Merge behaviour in newer git versions (> v2.16) is slightly different.

This broke one test with an error something like:
Traceback (most recent call last):
  File "tests/component/rpm/test_import_orig_rpm.py", line 243, in test_misc_options
    eq_(len(repo.get_commits(until='pack')), 3)
AssertionError: 2 != 3

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

Author: marquiz

tests/component/rpm/test_import_orig_rpm.py

@@ -222,6 +222,10 @@ def test_noninteractive(self):
     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')