Consider --no-merge when importing original tarball

Change-Id: I450f9c71e91c97cc7d9f732c6a953ce3f2ecddb4

diff --git a/gitbuildsys/cmd_import.py b/gitbuildsys/cmd_import.py
index 36ae537..db4896e 100644 (file)
--- a/gitbuildsys/cmd_import.py
+++ b/gitbuildsys/cmd_import.py
@@ -45,7 +45,10 @@ def do(opts, args):
                             "--packaging-dir=packaging", args[0]]):
             msger.error("Failed to import %s" % args[0])
     else:
-        if gbp_import_orig(['argv[0] placeholder', args[0]]):
+        params = ['argv[0] placeholder', args[0]]
+        if opts.no_merge:
+            params.append('--no-merge')
+        if gbp_import_orig(params):
             msger.error('Failed to import %s' % args[0])
 
     msger.info('done.')