Merge pull request square#39 from square/jmartin/unable-to-read-sha1-error

Clear the cache on an 'unable to read sha1' error

Author: Justin Martin

Gemfile.lock

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

lib/git-fastclone.rb

@@ -353,12 +353,13 @@ def with_git_mirror(url)
           yield dir
         rescue Terrapin::ExitStatusError => e
           error_strings = [
-            'missing blob object',
-            'remote did not send all necessary objects',
-            /packed object [a-z0-9]+ \(stored in .*?\) is corrupt/,
-            /pack has \d+ unresolved deltas/
+            'fatal: missing blob object',
+            'fatal: remote did not send all necessary objects',
+            /fatal: packed object [a-z0-9]+ \(stored in .*?\) is corrupt/,
+            /fatal: pack has \d+ unresolved deltas/,
+            'error: unable to read sha1 file of '
           ]
-          if e.to_s =~ /^STDERR:\n.+^fatal: #{Regexp.union(error_strings)}/m
+          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
             # the cache directory entirely. This may cause the current clone to fail, but if the
             # underlying error from git is transient it will not affect future clones.

lib/git-fastclone/version.rb

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

spec/git_fastclone_runner_spec.rb

@@ -360,4 +360,33 @@
       expect(yielded).to eq([test_url_valid])
     end
   end
+
+  it 'should retry when the cache errors with unable to read sha1 file' 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: unable to read sha1 file of sqiosbuild/lib/action/action.rb (6113b739af82d8b07731de8a58d6e233301f80ab)
+            fatal: unable to checkout working tree
+            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
 end