From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Sun, 29 Jan 2012 21:45:34 +0000 (+0000)
Subject: Two f's if you really really mean it
X-Git-Tag: 0.1~1013
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c87da3bbebee858ddad7887ad464f6a272ba23d5;p=fdroidserver.git

Two f's if you really really mean it
---

diff --git a/common.py b/common.py
index d91077e5..45da68c6 100644
--- a/common.py
+++ b/common.py
@@ -95,7 +95,7 @@ class vcs_git(vcs):
                 raise VCSException("Git reset failed")
             # Remove untracked files now, in case they're tracked in the target
             # revision (it happens!)...
-            if subprocess.call(['git', 'clean', '-dfx'], cwd=self.local) != 0:
+            if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
                 raise VCSException("Git clean failed")
             if not self.refreshed:
                 # Get latest commits and tags from remote...
@@ -110,7 +110,7 @@ class vcs_git(vcs):
         if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
             raise VCSException("Git checkout failed")
         # Get rid of any uncontrolled files left behind...
-        if subprocess.call(['git', 'clean', '-dfx'], cwd=self.local) != 0:
+        if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
             raise VCSException("Git clean failed")
 
     def initsubmodules(self):
@@ -149,7 +149,7 @@ class vcs_gitsvn(vcs):
                 raise VCSException("Git reset failed")
             # Remove untracked files now, in case they're tracked in the target
             # revision (it happens!)...
-            if subprocess.call(['git', 'clean', '-dfx'], cwd=self.local) != 0:
+            if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
                 raise VCSException("Git clean failed")
             if not self.refreshed:
                 # Get new commits and tags from repo...
@@ -167,7 +167,7 @@ class vcs_gitsvn(vcs):
         if subprocess.call(['git', 'checkout', rev], cwd=self.local) != 0:
             raise VCSException("Git checkout failed")
         # Get rid of any uncontrolled files left behind...
-        if subprocess.call(['git', 'clean', '-dfx'], cwd=self.local) != 0:
+        if subprocess.call(['git', 'clean', '-dffx'], cwd=self.local) != 0:
             raise VCSException("Git clean failed")
 
 class vcs_svn(vcs):