Have git cache bootstrap repo if repo is corrupt

git_cache.py

Index: git_cache.py
diff --git a/git_cache.py b/git_cache.py
index 75fb29ac4a638cc87353e04b957a53f383bc7dc9..eab17c97ee86fbac5b9a641aaffb6ae569afce10 100755
--- a/git_cache.py
+++ b/git_cache.py
@@ -310,7 +310,7 @@ class Mirror(object):
     return os.path.isfile(os.path.join(self.mirror_path, 'config'))
 
   def populate(self, depth=None, shallow=False, bootstrap=False,
-               verbose=False, ignore_lock=False):
+               verbose=False, ignore_lock=False, recurse=False):
     assert self.GetCachePath()
     if shallow and not depth:
       depth = 10000
@@ -374,6 +374,13 @@ class Mirror(object):
         try:
           self.RunGit(fetch_cmd + [spec], cwd=rundir, retry=True)
         except subprocess.CalledProcessError:
+          if spec == '+refs/heads/*:refs/heads/*':
+            if not recurse:
+              # We definitely want to fail if the main refspec fails to fetch.
+              raise
+            # The cache is corrupt, bootstrap it.

[agable, 2014/06/24 00:49:37]

What does recursion have to do with it? And nothing sets recurse=True, so we'll
always hit the codepath above and never re-bootstrap.

[Ryan Tseng, 2014/06/24 01:02:10]

Oops, that was supposed to default to recurse=True, fixed.

+            os.remove(config_file)
+            self.populate(depth, shallow, True, verbose, ignore_lock, False)
           logging.warn('Fetch of %s failed' % spec)
       if tempdir:
         os.rename(tempdir, self.mirror_path)