kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'update-third-party-git-2.9'

Browse Source 
dcb2e39f update-third-party: support Git 2.9.0's new merge restrictions
This commit is contained in:
Brad King 2016-08-24 14:23:56 -04:00 committed by CMake Topic Stage
commit 81c3e637cc
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Utilities/Scripts/update-third-party.bash
View File

@ -155,8 +155,14 @@ popd
if [ -n "$basehash" ]; then if [ -n "$basehash" ]; then
git merge --log -s recursive "-Xsubtree=$subtree/" --no-commit "upstream-$name" git merge --log -s recursive "-Xsubtree=$subtree/" --no-commit "upstream-$name"
else 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 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" git read-tree -u --prefix="$subtree/" "upstream-$name"
fi fi
git commit --no-edit git commit --no-edit