try

square · Sep 1, 2023 · 52164f4 · 52164f4
1 parent 3e6a0a3
commit 52164f4
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/lib/git-fastclone.rb b/lib/git-fastclone.rb
@@ -225,10 +225,9 @@ def clone(url, rev, src_dir, config)
 
       # Only checkout if we're changing branches to a non-default branch
       if rev
-        Dir.chdir(File.join(abs_clone_path, src_dir)) do
           fail_on_error('git', 'checkout', '--quiet', rev.to_s, quiet: !verbose,
-                                                                print_on_failure: print_git_errors)
-        end
+                                                                print_on_failure: print_git_errors,
+                                                              :chdir => File.join(abs_clone_path, src_dir))
       end
 
       update_submodules(src_dir, url)
@@ -251,10 +250,9 @@ def update_submodules(pwd, url)
       threads = []
       submodule_url_list = []
       output = ''
-      Dir.chdir(File.join(abs_clone_path, pwd).to_s) do
-        output = fail_on_error('git', 'submodule', 'init', quiet: !verbose,
-                                                           print_on_failure: print_git_errors)
-      end
+      output = fail_on_error('git', 'submodule', 'init', quiet: !verbose,
+                                                          print_on_failure: print_git_errors,
+                                                          :chdir => File.join(abs_clone_path, pwd))
 
       output.split("\n").each do |line|
         submodule_path, submodule_url = parse_update_info(line)
@@ -270,9 +268,9 @@ def update_submodules(pwd, url)
     def thread_update_submodule(submodule_url, submodule_path, threads, pwd)
       threads << Thread.new do
         with_git_mirror(submodule_url) do |mirror, _|
-          cmd = ['cd', File.join(abs_clone_path, pwd).to_s, '&&', 'git', 'submodule',
+          cmd = ['git', 'submodule',
                  verbose ? nil : '--quiet', 'update', '--reference', mirror.to_s, submodule_path.to_s].compact
-          fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors)
+          fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors, :chdir => File.join(abs_clone_path, pwd))
         end
 
         update_submodules(File.join(pwd, submodule_path), submodule_url)
@@ -348,8 +346,8 @@ def store_updated_repo(url, mirror, repo_name, fail_hard)
                       quiet: !verbose, print_on_failure: print_git_errors)
       end
 
-      cmd = ['cd', mirror, '&&', 'git', 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
-      fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors)
+      cmd = ['git', 'remote', verbose ? '--verbose' : nil, 'update', '--prune'].compact
+      fail_on_error(*cmd, quiet: !verbose, print_on_failure: print_git_errors, :chdir => mirror)
 
       reference_updated[repo_name] = true
     rescue RunnerExecutionRuntimeError => e