From e53f006d0832e44ccf20b9b692da924320248fd7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Fri, 1 Nov 2013 13:19:07 +0100
Subject: [PATCH] Checkout with --force on git

---
 fdroidserver/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 024e3dda..9f99a1bb 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -197,7 +197,7 @@ class vcs_git(vcs):
                 self.refreshed = True
         # Check out the appropriate revision...
         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")
         # Get rid of any uncontrolled files left behind...
         if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
-- 
2.30.2