Relintai/broken_seals
1
0
Fork 0
mirror of https://github.com/Relintai/broken_seals.git synced 2024-11-13 20:47:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Now the setup script will pull the right branch when updating the engine, this should fix git leaving lots of merge conflicts.

Browse Source
This commit is contained in:
Relintai 2020-06-18 11:35:05 +02:00
parent 65a95ece4e
commit 80fe41009a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -155,7 +155,9 @@ def setup_repository(data, clone_path, branch = 'master'):
subprocess.call('git reset --hard', shell=True) subprocess.call('git reset --hard', shell=True)
subprocess.call('git clean -f -d', shell=True) subprocess.call('git clean -f -d', shell=True)
subprocess.call('git checkout -B ' + branch + ' origin/' + branch, shell=True) subprocess.call('git checkout -B ' + branch + ' origin/' + branch, shell=True)
subprocess.call('git pull origin master', shell=True) subprocess.call('git pull origin ' + branch, shell=True)
subprocess.call('git reset', shell=True)
subprocess.call('git reset --hard', shell=True)
if data[1] in target_commits: if data[1] in target_commits:
target = target_commits[data[1]][branch] target = target_commits[data[1]][branch]