From dcb2e39fda75ef20b950fe293bbc989e95adbdec Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Thu, 16 Jun 2016 11:21:26 -0400
Subject: [PATCH] update-third-party: support Git 2.9.0's new merge
 restrictions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use the `--allow-unrelated-histories` flag to declare that we Know What
We're Doing™ (but only if necessary).
---
 Utilities/Scripts/update-third-party.bash | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Utilities/Scripts/update-third-party.bash b/Utilities/Scripts/update-third-party.bash
index 6aeeccd1b..3b8358e01 100644
--- a/Utilities/Scripts/update-third-party.bash
+++ b/Utilities/Scripts/update-third-party.bash
@@ -155,8 +155,14 @@ popd
 if [ -n "$basehash" ]; then
     git merge --log -s recursive "-Xsubtree=$subtree/" --no-commit "upstream-$name"
 else
+    unrelated_histories_flag=""
+    if git merge --help | grep -q -e allow-unrelated-histories; then
+        unrelated_histories_flag="--allow-unrelated-histories "
+    fi
+    readonly unrelated_histories_flag
+
     git fetch "$extractdir" "upstream-$name:upstream-$name"
-    git merge --log -s ours --no-commit "upstream-$name"
+    git merge --log -s ours --no-commit $unrelated_histories_flag "upstream-$name"
     git read-tree -u --prefix="$subtree/" "upstream-$name"
 fi
 git commit --no-edit