Forcing git checkout on branches
This commit is contained in:
parent
2c21375951
commit
3e6b71e771
1 changed files with 3 additions and 3 deletions
|
@ -42,7 +42,7 @@ def switch_to_branch (builder, branch):
|
||||||
else:
|
else:
|
||||||
myhead = repo.heads[branch]
|
myhead = repo.heads[branch]
|
||||||
|
|
||||||
myhead.checkout ()
|
myhead.checkout (force = True)
|
||||||
|
|
||||||
class SaveGDBResults (ShellCommand):
|
class SaveGDBResults (ShellCommand):
|
||||||
name = 'save build results'
|
name = 'save build results'
|
||||||
|
@ -88,7 +88,7 @@ class SaveGDBResults (ShellCommand):
|
||||||
myhead = repo.heads[builder]
|
myhead = repo.heads[builder]
|
||||||
|
|
||||||
if full_tag not in repo.tags:
|
if full_tag not in repo.tags:
|
||||||
myhead.checkout ()
|
myhead.checkout (force = True)
|
||||||
repo.index.add (['%s/gdb.sum' % builder,
|
repo.index.add (['%s/gdb.sum' % builder,
|
||||||
'%s/gdb.log' % builder,
|
'%s/gdb.log' % builder,
|
||||||
'%s/baseline' % builder])
|
'%s/baseline' % builder])
|
||||||
|
@ -134,7 +134,7 @@ class SaveGDBResults (ShellCommand):
|
||||||
else:
|
else:
|
||||||
myhead = repo.heads[branch]
|
myhead = repo.heads[branch]
|
||||||
|
|
||||||
myhead.checkout ()
|
myhead.checkout (force = True)
|
||||||
if full_tag not in repo.tags:
|
if full_tag not in repo.tags:
|
||||||
repo.index.add (['gdb.sum',
|
repo.index.add (['gdb.sum',
|
||||||
'gdb.log',
|
'gdb.log',
|
||||||
|
|
Loading…
Reference in a new issue