]> scripts.mit.edu Git - wizard.git/commitdiff
Make wizard force-add all files in case upstream includes .gitignore files
authorAlexander Chernyakhovsky <achernya@MIT.EDU>
Sun, 4 Sep 2011 22:33:29 +0000 (18:33 -0400)
committerEdward Z. Yang <ezyang@mit.edu>
Mon, 5 Sep 2011 03:10:34 +0000 (23:10 -0400)
Signed-off-by: Alexander Chernyakhovsky <achernya@MIT.EDU>
wizard/command/prepare_pristine.py

index d4c92331868688ef2700f168fc2a2d98902c10fb..ad660720ed5890ce641ace80c997f68df2b625dd 100644 (file)
@@ -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)