Merge pull request #43 from square/segiddins/retry-and-blow-away-cache-when-reading-tree-fails

Blow away cache and retry when reading tree fails after clone

Author: segiddins

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git-fastclone (1.2.6)
+    git-fastclone (1.2.7)
       colorize
       terrapin (~> 0.6.0)
 

lib/git-fastclone.rb

@@ -358,7 +358,8 @@ def with_git_mirror(url)
             /fatal: packed object [a-z0-9]+ \(stored in .*?\) is corrupt/,
             /fatal: pack has \d+ unresolved delta/,
             'error: unable to read sha1 file of ',
-            'fatal: did not receive expected object'
+            'fatal: did not receive expected object',
+            /^fatal: unable to read tree [a-z0-9]+\n^warning: Clone succeeded, but checkout failed/
           ]
           if e.to_s =~ /^STDERR:\n.+^#{Regexp.union(error_strings)}/m
             # To avoid corruption of the cache, if we failed to update or check out we remove

lib/git-fastclone/version.rb

@@ -2,5 +2,5 @@
 
 # Version string for git-fastclone
 module GitFastCloneVersion
-  VERSION = '1.2.6'.freeze
+  VERSION = '1.2.7'.freeze
 end

spec/git_fastclone_runner_spec.rb

@@ -306,7 +306,7 @@
       expect(yielded).to eq([test_url_valid])
     end
 
-    it 'should retry when the clone succeeds but checkout fails' do
+    it 'should retry when the clone succeeds but checkout fails with corrupt packed object' do
       allow(subject).to receive(:update_reference_repo) {}
       expect(subject).to receive(:reference_repo_dir)
       expect(subject).to receive(:reference_repo_lock_file).and_return(lockfile)
@@ -333,6 +333,35 @@
       expect(yielded).to eq([test_url_valid])
     end
 
+    it 'should retry when the clone succeeds but checkout fails with unable to read tree' do
+      allow(subject).to receive(:update_reference_repo) {}
+      expect(subject).to receive(:reference_repo_dir)
+      expect(subject).to receive(:reference_repo_lock_file).and_return(lockfile)
+
+      responses = [
+        lambda { |_url|
+          raise Terrapin::ExitStatusError, <<-ERROR.gsub(/^ {12}/, '')
+            STDOUT:
+
+            STDERR:
+
+            error: Could not read 92cf57b8f07df010ab5f607b109c325e30e46235
+            fatal: unable to read tree 0c32c0521d3b0bfb4e74e4a39b97a84d1a3bb9a1
+            warning: Clone succeeded, but checkout failed.
+            You can inspect what was checked out with 'git status'
+            and retry with 'git restore --source=HEAD :/'
+          ERROR
+        },
+        ->(url) { url }
+      ]
+      subject.with_git_mirror(test_url_valid) do
+        yielded << responses.shift.call(test_url_valid)
+      end
+
+      expect(responses).to be_empty
+      expect(yielded).to eq([test_url_valid])
+    end
+
     it 'should retry when one delta is missing' do
       allow(subject).to receive(:update_reference_repo) {}
       expect(subject).to receive(:reference_repo_dir)