mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-05 23:10:29 +03:00
Checkout with --force on git
This commit is contained in:
parent
e24a89916a
commit
e53f006d08
1 changed files with 1 additions and 1 deletions
|
|
@ -197,7 +197,7 @@ class vcs_git(vcs):
|
||||||
self.refreshed = True
|
self.refreshed = True
|
||||||
# Check out the appropriate revision...
|
# Check out the appropriate revision...
|
||||||
rev = str(rev if rev else 'origin/master')
|
rev = str(rev if rev else 'origin/master')
|
||||||
if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
|
if subprocess.call(['git', 'checkout', '-f', rev], cwd=self.local) != 0:
|
||||||
raise VCSException("Git checkout failed")
|
raise VCSException("Git checkout failed")
|
||||||
# Get rid of any uncontrolled files left behind...
|
# Get rid of any uncontrolled files left behind...
|
||||||
if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
|
if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue