From: Alexander Chernyakhovsky <achernya@MIT.EDU>
Date: Sun, 4 Sep 2011 22:33:29 +0000 (-0400)
Subject: Make wizard force-add all files in case upstream includes .gitignore files
X-Git-Url: https://scripts.mit.edu/gitweb/wizard.git/commitdiff_plain/0d054f889445688ace24d38b7c09ccde64f39247

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

Signed-off-by: Alexander Chernyakhovsky <achernya@MIT.EDU>
---

diff --git a/wizard/command/prepare_pristine.py b/wizard/command/prepare_pristine.py
index d4c9233..ad66072 100644
--- a/wizard/command/prepare_pristine.py
+++ b/wizard/command/prepare_pristine.py
@@ -34,7 +34,7 @@ def main(argv, baton):
             if not filenames and not dirnames:
                 open(os.path.join(dirpath, ".preserve-dir"), "w").write("")
         # stage all changes
-        shell.call("git", "add", ".")
+        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)