upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-24 18:48:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "refusing to merge unrelated histories" error

Browse Source
This commit is contained in:
Martin Hrubý (hrubymar10) 2020-08-28 10:10:47 +02:00
parent 9e5326aa1d
commit 8ba4e4fca9
No known key found for this signature in database
GPG Key ID: 3042E73421447651
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
projectfiles/Xcode/Fix_Xcode_Dependencies
View File

@ -37,6 +37,10 @@ time_interval_to_string() {
echo "==> Operation took $days days $hours hours $minutes minutes and $seconds seconds ..."
fi
}
get_mcs() {
git clone -b "master" --depth 1 "https://github.com/hrubymar10/MacCompileStuff" "MacCompileStuff-master"
}
###/Functions
starttimestamp=`date +%s`
@ -65,10 +69,17 @@ if ! [ -d "temp" ]; then
fi
cd "temp"
if ! [ -d "MacCompileStuff-master" ]; then
git clone -b "master" --depth 1 "https://github.com/hrubymar10/MacCompileStuff" "MacCompileStuff-master"
get_mcs
else
cd "MacCompileStuff-master"
git pull --depth 5
if ! [ $? -eq 0 ]; then
echo 'Error: MacCompileStuff is too far from the local commit. Clonning again...' >&2
cd ".."
rm -rf "MacCompileStuff-master"
get_mcs
fi
fi
cd "MacCompileStuff-master"
git pull --depth 1
cd "${MY_PATH}"
rm -rf "Headers"