git-fastclone 1.2.1 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b66c5e0946f4cfae0ecb36ac298f9b6e76e85a829ee17fd8a3425c92468e3c8d
-  data.tar.gz: 3364449b9348575acf9ec4dfd2f73883e19e634340d35a0aa8df9ffe4f9c3aaf
+  metadata.gz: 22f5537cbc1297198ea1aa106a305ef5ad9526dc24fc9a39048c6889e6d441b4
+  data.tar.gz: 0f1f38ba2756185c3c02b7a5ec3cf40c01e4498e743388f41991ca1d817793de
 SHA512:
-  metadata.gz: 04a9315f022dba1cdb0ac34dd4daa768d9c19a1cbdb7eea3767098e8bc120e1a5ad2676c0e9791dc964f0b4fabd373b8d807faecbd9a4dde243ab1e97f927f5b
-  data.tar.gz: 96ea39ac905ac8f512322a03c3556acdd8d13174d9b5ad8591ab8ee73ea12f679c7481817e099d3300ccfea714977b9b72e93efd9148f7a878035dd8c68f4b6f
+  metadata.gz: 22634dabfc0c4d91682dc7db8d9e18e6cdc4a6d6db079a66c5e498ccc6ed70c8bcb7ccd24657b91e5142d0fe8be0f34169223d1d70cb1262ed3c6d88e3ec0e83
+  data.tar.gz: 8dd73fac0eb7eec9b8e8ead616a48549860722982b756b950ad020cd295da4dffeaf4b89b7dad3c88f2dc4b82119a40172a499441924bbcf2885e280313850eb

data/lib/git-fastclone.rb

@@ -352,7 +352,16 @@ module GitFastClone
         begin
           yield dir
         rescue Terrapin::ExitStatusError => e
-          if e.to_s =~ /^STDERR:\n.+^fatal: (missing blob object|remote did not send all necessary objects)/m
+          error_strings = [
+            '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 delta/,
+            'error: unable to read sha1 file of ',
+            '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
             # 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.

data/lib/git-fastclone/version.rb

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

data/spec/git_fastclone_runner_spec.rb

@@ -305,5 +305,172 @@ describe GitFastClone::Runner do
       expect(responses).to be_empty
       expect(yielded).to eq([test_url_valid])
     end
+
+    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)
+
+      responses = [
+        lambda { |_url|
+          raise Terrapin::ExitStatusError, <<-ERROR.gsub(/^ {12}/, '')
+            STDOUT:
+
+            STDERR:
+
+            fatal: packed object 7c4d79704f8adf701f38a7bfb3e33ec5342542f1 (stored in /private/var/tmp/git-fastclone/reference/some-repo.git/objects/pack/pack-d37d7ed3e88d6e5f0ac141a7b0a2b32baf6e21a0.pack) is corrupt
+            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 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)
+      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 f7fad86d06fee0678f9af7203b6031feabb40c3e
+            fatal: pack has 1 unresolved delta
+            fatal: index-pack failed
+          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 deltas are missing' 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 f7fad86d06fee0678f9af7203b6031feabb40c3e
+            fatal: pack has 138063 unresolved deltas
+            fatal: index-pack failed
+          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
+
+  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
+
+  it 'should retry when the cache errors with did not receive expected 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)
+
+    responses = [
+      lambda { |_url|
+        raise Terrapin::ExitStatusError, <<-ERROR.gsub(/^ {12}/, '')
+            STDOUT:
+
+            STDERR:
+
+            error: Could not read 6682dfe81f66656436e60883dd795e7ec6735153
+            error: Could not read 0cd3703c23fa44c0043d97fbc26356a23939f31b
+            fatal: did not receive expected object 3c64c9dd49c79bd09aa13d4b05ac18263ca29ccd
+            fatal: index-pack failed
+        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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: git-fastclone
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.7
 platform: ruby
 authors:
 - Michael Tauraso
 - James Chang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -62,7 +62,7 @@ homepage: http://square.github.io/git-fastclone/
 licenses:
 - Apache
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: git-clone --recursive on steroids!
 test_files: