From: Jun Wang <junbill.wang@samsung.com>
Date: Tue, 20 Dec 2016 08:05:32 +0000 (+0800)
Subject: Adapt git-merge option when git version greater then 2.9
X-Git-Tag: debian/0.7.5~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=10bbc5251e92550332f402c716e0f4e7bbfdffd5;p=tools%2Fgit-buildpackage.git

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 d7eb271e..6d971c22 100644
--- 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)