From: Daniel Martí <mvdan@mvdan.cc>
Date: Fri, 1 Nov 2013 12:19:29 +0000 (+0100)
Subject: Also reset --hard and clean -dffx the git submodules
X-Git-Tag: 0.1~244^2~2
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0c8283bc1aab225573a4a01e101b95b68362d885;p=fdroidserver.git

Also reset --hard and clean -dffx the git submodules
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 9f99a1bb..52681b84 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -211,6 +211,14 @@ class vcs_git(vcs):
         if subprocess.call(['git', 'submodule', 'update'],
                 cwd=self.local) != 0:
             raise VCSException("Git submodule update failed")
+		if subprocess.call(['git', 'submodule', 'foreach',
+			'git', 'reset', '--hard'],
+				cwd=self.local) != 0:
+			raise VCSException("Git submodule reset failed")
+		if subprocess.call(['git', 'submodule', 'foreach',
+			'git', 'clean', '-dffx'],
+				cwd=self.local) != 0:
+			raise VCSException("Git submodule clean failed")
 
     def gettags(self):
         self.checkrepo()