Harden the migration script slightly.

Signed-off-by: Edward Z. Yang <edwardzyang@thewritingpot.com>

diff --git a/TODO b/TODO
index 284c08814f839ebe6e12a6e8f130613d166a27bb..c467861431b8da12aa8eb139fe1f0f32b17f0bc6 100644 (file)
--- a/TODO
+++ b/TODO
@@ -24,6 +24,8 @@ NOTES:
 - summary and info are still not using loggers. Maybe they should,
   maybe they shouldn't
 
+- We need another patched AFS server to deploy updates off of.
+
 OVERALL PLAN:
 
 * Some parts of the infrastructure will not be touched, although I plan

diff --git a/lib/wizard/command/migrate.py b/lib/wizard/command/migrate.py
index 09e6ff8e5f7a65e507ceace5701e48952a981085..056d4482de6d6295fb346e357b72dccb42c6eb73 100644 (file)
--- a/lib/wizard/command/migrate.py
+++ b/lib/wizard/command/migrate.py
@@ -138,7 +138,7 @@ what repository and tag to use."""
     did_git_checkout_scripts = False
     try:
         # create repository
-        shell.call("git", "init")
+        shell.call("git", "--git-dir=.git", "init")
         did_git_init = True
         # configure our remote
         shell.call("git", "remote", "add", "origin", repo)
@@ -148,7 +148,7 @@ what repository and tag to use."""
         # perform the initial fetch
         shell.call("git", "fetch", "origin")
         # soft reset to our tag
-        shell.call("git", "reset", tag)
+        shell.call("git", "reset", tag, "--")
         # checkout the .scripts directory
         shell.call("git", "checkout", ".scripts")
         did_git_checkout_scripts = True