git-fastclone 1.2.6 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01c5d2b0002171f3ace397e442a8999737eebb0058fb5ad28fd731324ccac7e3
-  data.tar.gz: 4cd6568ac0f74b314e8bd861f5957e3bc7f1e76cdf663308aa8c85702919bbb5
+  metadata.gz: 3e6bcf21a8d3b9c1b30b93efc17487fa8dfa0c319b8636efc1f96a430e27c876
+  data.tar.gz: 7720184507344bc94ad63e45b135e0948aab6776d371867159a4cd84dcfd2a0d
 SHA512:
-  metadata.gz: '09963171d37af7b9c8eb01fbec2de51e9f35319e1367284a635dac32424651e7a719f7e42489843d7b11333a321e938ff94ca0413ef3aa72b907c53d2e37c75f'
-  data.tar.gz: 91aaeec03b1b9144b8859802646bd6caa466daa6d7e0763536ce0d7e10dfc8acbd5d7939b0b24455a2754c39b3f7999e5873a763ecc45fbed92446d45136c8ae
+  metadata.gz: 13e48d37e5162a8288da830232476fb12ba7b8bb01c0ef0834a8eb372a224c0a2f8430d10002a9c54c1ec7fc7713db384ef32d0da9f1707366663bbe10e9ff04
+  data.tar.gz: 1f74af758cfbd3f47f98f6d4fc1a47e24bf574f9e7b58116b9aa3f6186ab334e66c66e413416641b7ce6494b3099b45158142fbd88b4c1bb3a0bb48a86c9b912

data/lib/git-fastclone/version.rb

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

data/lib/git-fastclone.rb

@@ -121,7 +121,7 @@ module GitFastClone
       puts "Cloning #{path_from_git_url(url)} to #{File.join(abs_clone_path, path)}"
       Terrapin::CommandLine.environment['GIT_ALLOW_PROTOCOL'] =
         ENV['GIT_ALLOW_PROTOCOL'] || DEFAULT_GIT_ALLOW_PROTOCOL
-      clone(url, options[:branch], path)
+      clone(url, options[:branch], path, options[:config])
     end
 
     def parse_options
@@ -148,6 +148,10 @@ module GitFastClone
           self.color = true
         end
 
+        opts.on('--config CONFIG', 'Git config applied to the cloned repo') do |config|
+          options[:config] = config
+        end
+
         opts.on('--lock-timeout N', 'Timeout in seconds to acquire a lock on any reference repo.
                 Default is 0 which waits indefinitely.') do |timeout_secs|
           self.flock_timeout_secs = timeout_secs
@@ -187,14 +191,17 @@ module GitFastClone
 
     # Checkout to SOURCE_DIR. Update all submodules recursively. Use reference
     # repos everywhere for speed.
-    def clone(url, rev, src_dir)
+    def clone(url, rev, src_dir, config)
       initial_time = Time.now
 
       with_git_mirror(url) do |mirror|
-        Terrapin::CommandLine.new('git clone', '--quiet --reference :mirror :url :path')
+        clone_command = '--quiet --reference :mirror :url :path'
+        clone_command += ' --config :config' unless config.nil?
+        Terrapin::CommandLine.new('git clone', clone_command)
                              .run(mirror: mirror.to_s,
                                   url: url.to_s,
-                                  path: File.join(abs_clone_path, src_dir).to_s)
+                                  path: File.join(abs_clone_path, src_dir).to_s,
+                                  config: config.to_s)
       end
 
       # Only checkout if we're changing branches to a non-default branch
@@ -358,7 +365,8 @@ module GitFastClone
             /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

data/spec/git_fastclone_runner_spec.rb

@@ -56,11 +56,22 @@ describe GitFastClone::Runner do
     let(:options) { { branch: placeholder_arg } }
 
     it 'should run with the correct args' do
-      allow(subject).to receive(:parse_inputs) { [placeholder_arg, placeholder_arg, options] }
-      expect(subject).to receive(:clone).with(placeholder_arg, placeholder_arg, placeholder_arg)
+      allow(subject).to receive(:parse_inputs) { [placeholder_arg, placeholder_arg, options, nil] }
+      expect(subject).to receive(:clone).with(placeholder_arg, placeholder_arg, placeholder_arg, nil)
 
       subject.run
     end
+
+    describe 'with custom configs' do
+      let(:options) { { branch: placeholder_arg, config: 'conf' } }
+
+      it 'should clone correctly' do
+        allow(subject).to receive(:parse_inputs) { [placeholder_arg, placeholder_arg, options, 'conf'] }
+        expect(subject).to receive(:clone).with(placeholder_arg, placeholder_arg, placeholder_arg, 'conf')
+
+        subject.run
+      end
+    end
   end
 
   describe '.parse_inputs' do
@@ -74,17 +85,50 @@ describe GitFastClone::Runner do
   end
 
   describe '.clone' do
-    it 'should clone correctly' do
-      terrapin_commandline_double = double('new_terrapin_commandline')
-      allow(subject).to receive(:with_git_mirror) {}
+    let(:terrapin_commandline_double) { double('new_terrapin_commandline') }
+    before(:each) do
       allow(terrapin_commandline_double).to receive(:run) {}
-      allow(Terrapin::CommandLine).to receive(:new) { terrapin_commandline_double }
-
       expect(Time).to receive(:now).twice { 0 }
-      expect(Terrapin::CommandLine).to receive(:new)
-      expect(terrapin_commandline_double).to receive(:run)
+      allow(Dir).to receive(:pwd) { '/pwd' }
+      allow(Dir).to receive(:chdir).and_yield
+      allow(subject).to receive(:with_git_mirror).and_yield('/cache')
+    end
 
-      subject.clone(placeholder_arg, placeholder_arg, '.')
+    it 'should clone correctly' do
+      expect(Terrapin::CommandLine).to receive(:new).with(
+        'git clone',
+        '--quiet --reference :mirror :url :path'
+      ) { terrapin_commandline_double }
+      expect(Terrapin::CommandLine).to receive(:new).with(
+        'git checkout',
+        '--quiet :rev'
+      ) { terrapin_commandline_double }
+      expect(terrapin_commandline_double).to receive(:run).with(
+        mirror: '/cache',
+        url: placeholder_arg,
+        path: '/pwd/.',
+        config: ''
+      )
+      expect(terrapin_commandline_double).to receive(:run).with(rev: placeholder_arg)
+
+      subject.clone(placeholder_arg, placeholder_arg, '.', nil)
+    end
+
+    describe 'with custom configs' do
+      it 'should clone correctly' do
+        expect(Terrapin::CommandLine).to receive(:new).with(
+          'git clone',
+          '--quiet --reference :mirror :url :path --config :config'
+        ) { terrapin_commandline_double }
+        expect(terrapin_commandline_double).to receive(:run).with(
+          mirror: '/cache',
+          url: placeholder_arg,
+          path: '/pwd/.',
+          config: 'config'
+        )
+
+        subject.clone(placeholder_arg, nil, '.', 'config')
+      end
     end
   end
 
@@ -306,7 +350,7 @@ describe GitFastClone::Runner do
       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 +377,35 @@ describe GitFastClone::Runner do
       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)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: git-fastclone
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.3.0
 platform: ruby
 authors:
 - Michael Tauraso
 - James Chang
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-17 00:00:00.000000000 Z
+date: 2022-12-03 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
@@ -77,8 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: git-clone --recursive on steroids!
 test_files: