[Cmake-commits] CMake branch, next, updated. v3.6.1-1402-g6b3d7f6

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  6b3d7f642cab71d8ac0fa7fba01739d86d909ac3 (commit)
       via  dcb2e39fda75ef20b950fe293bbc989e95adbdec (commit)
      from  15d79ad650d39c88120c897c40dec40ef756948f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6b3d7f642cab71d8ac0fa7fba01739d86d909ac3
commit 6b3d7f642cab71d8ac0fa7fba01739d86d909ac3
Merge: 15d79ad dcb2e39
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 24 14:23:44 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 24 14:23:44 2016 -0400

    Merge topic 'update-third-party-git-2.9' into next
    
    dcb2e39f update-third-party: support Git 2.9.0's new merge restrictions


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dcb2e39fda75ef20b950fe293bbc989e95adbdec
commit dcb2e39fda75ef20b950fe293bbc989e95adbdec
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Thu Jun 16 11:21:26 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 24 14:16:13 2016 -0400

    update-third-party: support Git 2.9.0's new merge restrictions
    
    Use the `--allow-unrelated-histories` flag to declare that we Know What
    We're Doing™ (but only if necessary).

diff --git a/Utilities/Scripts/update-third-party.bash b/Utilities/Scripts/update-third-party.bash
index 6aeeccd..3b8358e 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

-----------------------------------------------------------------------

Summary of changes:
 Utilities/Scripts/update-third-party.bash |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake