Make wizard force-add all files in case upstream includes .gitignore files

[wizard.git] / wizard / command / prepare_pristine.py

diff --git a/wizard/command/prepare_pristine.py b/wizard/command/prepare_pristine.py
index b628a42e05c9f9eb4c6c94f63f4584ffb99cec55..ad660720ed5890ce641ace80c997f68df2b625dd 100644 (file)
--- a/wizard/command/prepare_pristine.py
+++ b/wizard/command/prepare_pristine.py
@@ -33,7 +33,11 @@ def main(argv, baton):
             if "/.git" in dirpath: continue
             if not filenames and not dirnames:
                 open(os.path.join(dirpath, ".preserve-dir"), "w").write("")
-        shell.call("git", "add", ".")
+        # stage all changes
+        shell.call("git", "add", "-f", ".")
+        for f in shell.call("git", "ls-files", "-d", "-z")[0].split("\0"):
+            if f != "":
+                shell.call("git", "rm", "--", f)
 
 def parse_args(argv, baton):
     usage = """usage: %prog prepare-pristine APP-VERSION