Adapt git-merge option when git version greater then 2.9

Change-Id: Icd9cb9edc8517095984c0a0f497173e2f068aa20

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index d7eb271..6d971c2 100644 (file)
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -539,6 +539,13 @@ class GitRepository(object):
         else:
             log.debug("Your git suite doesn't support --edit/--no-edit "
                       "option for git-merge ")
+
+        if (self._cmd_has_feature('merge', 'allow-unrelated-histories')):
+            args.add_cond(True, '--allow-unrelated-histories')
+        else:
+            log.debug("Your git suite doesn't support --allow-unrelated-histories "
+                      "option for git-merge ")
+
         args.add(commit)
         self._git_command("merge", args.args)