git-fastclone 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e50fa1e33c6aaf524cd7d9860010d7826c1c110b35cbbf7e35006b8d0f04ec
-  data.tar.gz: 3b5e733a76ba36cb3e8b851600094995247841f9c5655208347a47daefcd5eb1
+  metadata.gz: 35118c0d971e4f97e889723386ad30de71ebc426dee6a1302578ad4ea21ed869
+  data.tar.gz: 6b66bf1d46e74b219e40b2fb88bb9e6f348edb5e5342704449fa06726a1d0b1b
 SHA512:
-  metadata.gz: 20d61371e4348ae34919dfa236f13413653f433908d941a9987d8404d9b177c9bb7b72209ce5c609f5b24e09949e4ec69858f30040a7b7c9da8e6d56d9f80c42
-  data.tar.gz: ce65442150e9ef8c5fe35b5c6f0d1c3e7430cd6cf128a06e0166de971c215b194475b080a698f33a29eccf84c0ad2f9afcf57f16a0d2de45424502399914ef90
+  metadata.gz: f0157f54b9b9add66469acbd07859884b02b020887d589c56bcc92267c63eff6bddeba90b7a1ff1486ae6da9341602c439e2f00bf885aa7e7634929ad7ee3ec3
+  data.tar.gz: 15d09bc6008f1aa851f6b3192c9eaf88fbf40b0000b51c235172601ea489d8477f9bc1cd8142ab36e191c6496bda3057d6b0933f6f5f3e7e1109f3b0d8de8ab8

data/lib/git-fastclone.rb

@@ -355,6 +355,7 @@ module GitFastClone
           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/
           ]
           if e.to_s =~ /^STDERR:\n.+^fatal: #{Regexp.union(error_strings)}/m

data/lib/git-fastclone/version.rb

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

data/spec/git_fastclone_runner_spec.rb

@@ -306,6 +306,33 @@ describe GitFastClone::Runner do
       expect(yielded).to eq([test_url_valid])
     end
 
+    it 'should retry when the clone succeeds but checkout fails' 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 deltas are missing' do
       allow(subject).to receive(:update_reference_repo) {}
       expect(subject).to receive(:reference_repo_dir)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-fastclone
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Michael Tauraso
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize