Make the commit not get call errors subsumed.

Signed-off-by: Edward Z. Yang <ezyang@mit.edu>

diff --git a/TODO b/TODO
index 9b7a6c6675915c09aa5377fe3c78af090cdd4bed..e6a2d26e98b3c84731b9b130134ea4e89fe1a3d5 100644 (file)
--- a/TODO
+++ b/TODO
@@ -3,6 +3,8 @@ The Git Autoinstaller
 TODO NOW:
 
 - Write the code to make Wordpress figure out its URL from the database
+- Remerges aren't reflected in the parent files, so `git diff` output is
+  spurious.  Not sure how to fix this w/o tree hackery.
 
 - wizard install wordpress should ask for password.  One problem with this is that
   Wordpress will still send mail with the wrong username and password, so Wordpress
@@ -10,6 +12,9 @@ TODO NOW:
   email to a null address and then fix it manually.
 - Parse output HTML for class="error" and give those errors back to the user (done),
   then boot them back into configure so they can enter in something different
+- Missing ancestor means that certain files cannot be merged, for the curious files;
+  this is indicated by 1,3 but missing 2.  There might be some cleverness to be
+  done here by finding a "fake" ancestor to use.
 
 - Replace gaierror with a more descriptive name (this is a DNS error)
 

diff --git a/wizard/command/upgrade.py b/wizard/command/upgrade.py
index 12c720576b9e5b40f053559b3f415c0a207f8c28..2e747e70aed5b8e59999d4d08066d1475222527b 100644 (file)
--- a/wizard/command/upgrade.py
+++ b/wizard/command/upgrade.py
@@ -102,9 +102,10 @@ def main(argv, baton):
         with util.ChangeDirectory(temp_wc_dir):
             try:
                 sh.call("git", "status")
-                sh.call("git", "commit", "-m", "throw-away commit")
             except shell.CallError:
                 pass
+            else:
+                sh.call("git", "commit", "-m", "throw-away commit")
             message = make_commit_message(version)
             new_tree = sh.eval("git", "rev-parse", "HEAD^{tree}")
             final_commit = sh.eval("git", "commit-tree", new_tree,