mirror/cmake
1
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-01-26 02:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

update-third-party: sync with upstream

Browse Source 
Fixes usage on Apple and defers shortlog generation until it is
necessary.
This commit is contained in:
Ben Boeckel 2026-01-22 15:30:28 -05:00
parent ebf93da48b
commit 5ffb9c9901
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.git-remote-files
View File

@ -1,5 +1,5 @@
[file "update-common.sh" from "https://gitlab.kitware.com/utils/git-import-third-party.git"]
commit = 8e52fdc2adb7d481798581af64047cbc228fea8e
commit = 8f83cbcdac0af41574abfb632dfbe2c403948803
branch = master
target = Utilities/Scripts/update-third-party.bash
comment = Core third party import logic

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

@ -160,8 +160,6 @@ else
basehash="$( git rev-list --author="$ownership" --grep="$basehash_regex" -n 1 HEAD )"
fi
readonly basehash
upstream_old_short="$( git cat-file commit "$basehash" | sed -n '/'"$basehash_regex"'/ {s/.*(//;s/)//;p;}' | grep -E '^[0-9a-f]+$' )"
readonly upstream_old_short
[ -n "$basehash" ] || \
warn "'basehash' is empty; performing initial import"
@ -212,6 +210,9 @@ readonly upstream_datetime
upstream_date="$( echo "$upstream_datetime" | grep -o -e "$regex_date" )"
readonly upstream_date
if $do_shortlog && [ -n "$basehash" ]; then
upstream_old_short="$( git -C "$toplevel_dir" cat-file commit "$basehash" | sed -n '/'"$basehash_regex"'/ {s/.*(//;s/)//;p;}' | grep -E '^[0-9a-f]+$' )"
readonly upstream_old_short
commit_shortlog="
Upstream Shortlog
@ -252,9 +253,10 @@ if [ -n "$basehash" ]; then
git merge --log -s recursive "-Xsubtree=$subtree/" --no-commit "upstream-$name"
else
# Note: on Windows 'git merge --help' will open a browser, and the check
# will fail, so use the flag by default.
# will fail, so use the flag by default. Apple opens an editor instead;
# assume the flag is understood there too.
unrelated_histories_flag=""
if git --version | grep -q windows; then
if git --version | grep -q -E 'windows|Apple'; then
unrelated_histories_flag="--allow-unrelated-histories"
elif git merge --help | grep -q -e allow-unrelated-histories; then
unrelated_histories_flag="--allow-unrelated-histories"