mirror of
https://github.com/xenia-project/xenia.git
synced 2025-12-06 07:12:03 +01:00
Fixed git checkout to canary-experimental instead of canary_experimental (#644)
This commit is contained in:
parent
422517c673
commit
1d7973aea5
10
xenia-build
10
xenia-build
|
|
@ -717,7 +717,7 @@ class PullCommand(Command):
|
||||||
*args, **kwargs)
|
*args, **kwargs)
|
||||||
self.parser.add_argument(
|
self.parser.add_argument(
|
||||||
'--merge', action='store_true',
|
'--merge', action='store_true',
|
||||||
help='Merges on canary-experimental instead of rebasing.')
|
help='Merges on canary_experimental instead of rebasing.')
|
||||||
self.parser.add_argument(
|
self.parser.add_argument(
|
||||||
'--target_os', default=None,
|
'--target_os', default=None,
|
||||||
help='Target OS passed to premake, for cross-compilation')
|
help='Target OS passed to premake, for cross-compilation')
|
||||||
|
|
@ -726,11 +726,11 @@ class PullCommand(Command):
|
||||||
print('Pulling...')
|
print('Pulling...')
|
||||||
print('')
|
print('')
|
||||||
|
|
||||||
print('- switching to canary-experimental...')
|
print('- switching to canary_experimental...')
|
||||||
shell_call([
|
shell_call([
|
||||||
'git',
|
'git',
|
||||||
'checkout',
|
'checkout',
|
||||||
'canary-experimental',
|
'canary_experimental',
|
||||||
])
|
])
|
||||||
print('')
|
print('')
|
||||||
|
|
||||||
|
|
@ -1474,12 +1474,12 @@ class NukeCommand(Command):
|
||||||
shutil.rmtree('build/')
|
shutil.rmtree('build/')
|
||||||
print('')
|
print('')
|
||||||
|
|
||||||
print('- git reset to canary-experimental...')
|
print('- git reset to canary_experimental...')
|
||||||
shell_call([
|
shell_call([
|
||||||
'git',
|
'git',
|
||||||
'reset',
|
'reset',
|
||||||
'--hard',
|
'--hard',
|
||||||
'canary-experimental',
|
'canary_experimental',
|
||||||
])
|
])
|
||||||
print('')
|
print('')
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue