git 1.13.1 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d000b5ac2ceebebeb6c84eae6aa1c6f4b3d58dd444f15c70390baadf7bb3c8e
-  data.tar.gz: f45ef489fb3aa2d3cff1a45cb127bb27fe380693af5e322220322fd8aa6dfd33
+  metadata.gz: 344c98cd98670d4afa26aae12680f28ad857f1fdbca4384a10c9cf7ed7937a8a
+  data.tar.gz: 9d857e44f2457f6c5208bebca6935991c2e88fbd82b2c482c570cd7afcca7c38
 SHA512:
-  metadata.gz: 6128142518501bce8bd4e5f40e178ac063359916daf544005bdc6187160619b74c6236a7f56b29438f3b5ebb547a5759b59b3140ee260ebd179bc8a4124d1a15
-  data.tar.gz: 56e9d4940992d8feab68502815563d6d16967c1d659748271bdd27e0e1a382f81ce4be4dd7682645b562f8b616be791f79437fdaaa072778aca724c91e40b4d1
+  metadata.gz: 6fd40652aa02ad36238522ee2210ad7c01ced240f0a1b91f2de3e6baefe93dd0a20fb22b80821ee45bf974d73a3cc346e4a5adbaa2322384b57e2bb0251d491d
+  data.tar.gz: 0c8d86fe09a9e4f8d06c1d8bb0abf05eff45a2746450253ccf751163e4340b873df4eff2dbfb0711aad30c61303e0c692802a378bceb46a26a1e17ba08927268

data/CHANGELOG.md

@@ -5,6 +5,30 @@
 
 # Change Log
 
+## v1.14.0 (2023-02-25)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.13.2..v1.14.0)
+
+Changes since v1.13.2:
+
+* 0f7c4a5 Allow the use of an array of path_limiters and add extended_regexp option to grep (#624)
+* 8992701 Refactor error thrown when a git command fails (#622)
+* cf74b91 Simplify how temp files are used when testing Git::Base#archive (#621)
+* a8bfb9d Set init.defaultBranch when running tests if it is not already set (#620)
+* 9ee7ca9 Create a null logger if a logger is not provided (#619)
+* 872de4c Internal refactor of Git::Lib command (#618)
+* 29e157d Simplify test running and fixture repo cloning (#615)
+* 08d04ef Use dynamically-created repo for signed commits test (#614)
+
+## v1.13.2 (2023-02-02)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.13.1..v1.13.2)
+
+Changes since v1.13.1:
+
+* b6e031d Fix `Git::Lib#commit_data` for GPG-signed commits (#610)
+* b12b820 Fix escaped path decoding (#612)
+
 ## v1.13.1 (2023-01-12)
 
 [Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.13.0...v1.13.1)

data/CONTRIBUTING.md

@@ -81,6 +81,18 @@ In order to ensure high quality, all pull requests must meet these requirements:
   * The entire test suite must pass when `bundle exec rake default` is run from the
     project's local working copy.
 
+While working on specific features you can run individual test files or
+a group of tests using `bin/test`:
+
+    # run a single file:
+    $ bin/test tests/units/test_object.rb
+
+    # run multiple files:
+    $ bin/test tests/units/test_object.rb tests/units/test_archive.rb
+
+    # run all unit tests:
+    $ bin/test
+
 ### Continuous integration
   * All tests must pass in the project's [GitHub Continuous Integration build](https://github.com/ruby-git/ruby-git/actions?query=workflow%3ACI)
     before the pull request will be merged.

data/Rakefile

@@ -1,16 +1,20 @@
 require 'bundler/gem_tasks'
 require 'English'
 
-require "#{File.expand_path(File.dirname(__FILE__))}/lib/git/version"
+require 'git/version'
 
 default_tasks = []
 
 desc 'Run Unit Tests'
 task :test do
-  sh 'git config --global user.email "git@example.com"' if `git config user.email`.empty?
-  sh 'git config --global user.name "GitExample"' if `git config user.name`.empty?
+  sh 'ruby bin/test'
 
-  require File.dirname(__FILE__) + '/tests/all_tests.rb'
+  # You can run individual test files (or multiple files) from the command
+  # line with:
+  #
+  # $ bin/test tests/units/test_archive.rb
+  #
+  # $ bin/test tests/units/test_archive.rb tests/units/test_object.rb
 end
 default_tasks << :test
 

data/lib/git/base.rb

@@ -1,4 +1,5 @@
 require 'git/base/factory'
+require 'logger'
 
 module Git
   # Git::Base is the main public interface for interacting with Git commands.
@@ -90,12 +91,8 @@ module Git
         options[:repository] ||= File.join(working_dir, '.git')
         options[:index] ||= File.join(options[:repository], 'index')
       end
-      if options[:log]
-        @logger = options[:log]
-        @logger.info("Starting Git")
-      else
-        @logger = nil
-      end
+      @logger = (options[:log] || Logger.new(nil))
+      @logger.info("Starting Git")
 
       @working_directory = options[:working_directory] ? Git::WorkingDirectory.new(options[:working_directory]) : nil
       @repository = options[:repository] ? Git::Repository.new(options[:repository]) : nil
@@ -212,6 +209,15 @@ module Git
     #     end
     #   end
     #
+    # @param string [String] the string to search for
+    # @param path_limiter [String, Array] a path or array of paths to limit the search to or nil for no limit
+    # @param opts [Hash] options to pass to the underlying `git grep` command
+    #
+    # @option opts [Boolean] :ignore_case (false) ignore case when matching
+    # @option opts [Boolean] :invert_match (false) select non-matching lines
+    # @option opts [Boolean] :extended_regexp (false) use extended regular expressions
+    # @option opts [String] :object (HEAD) the object to search from
+    #
     # @return [Hash<String, Array>] a hash of arrays
     #   ```Ruby
     #   {

data/lib/git/command_line_result.rb

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Git
+  # The result of running a git command
+  #
+  # This object stores the Git command executed and its status, stdout, and stderr.
+  #
+  # @api public
+  #
+  class CommandLineResult
+    # Create a CommandLineResult object
+    #
+    # @example
+    #   `true`
+    #   git_cmd = %w[git version]
+    #   status = $?
+    #   stdout = "git version 2.39.1\n"
+    #   stderr = ""
+    #   result = Git::CommandLineResult.new(git_cmd, status, stdout, stderr)
+    #
+    # @param git_cmd [Array<String>] the git command that was executed
+    # @param status [Process::Status] the status of the process
+    # @param stdout [String] the output of the process
+    # @param stderr [String] the error output of the process
+    #
+    def initialize(git_cmd, status, stdout, stderr)
+      @git_cmd = git_cmd
+      @status = status
+      @stdout = stdout
+      @stderr = stderr
+    end
+
+    # @attribute [r] git_cmd
+    #
+    # The git command that was executed
+    #
+    # @example
+    #  git_cmd = %w[git version]
+    #  result = Git::CommandLineResult.new(git_cmd, $?, "", "")
+    #  result.git_cmd #=> ["git", "version"]
+    #
+    # @return [Array<String>]
+    #
+    attr_reader :git_cmd
+
+    # @attribute [r] status
+    #
+    # The status of the process
+    #
+    # @example
+    #   `true`
+    #   status = $?
+    #   result = Git::CommandLineResult.new(status, "", "")
+    #   result.status #=> #<Process::Status: pid 87859 exit 0>
+    #
+    # @return [Process::Status]
+    #
+    attr_reader :status
+
+    # @attribute [r] stdout
+    #
+    # The output of the process
+    #
+    # @example
+    #   stdout = "git version 2.39.1\n"
+    #   result = Git::CommandLineResult.new($?, stdout, "")
+    #   result.stdout #=> "git version 2.39.1\n"
+    #
+    # @return [String]
+    #
+    attr_reader :stdout
+
+    # @attribute [r] stderr
+    #
+    # The error output of the process
+    #
+    # @example
+    #   stderr = "Tag not found\n"
+    #   result = Git::CommandLineResult.new($?, "", stderr)
+    #   result.stderr #=> "Tag not found\n"
+    #
+    # @return [String]
+    #
+    attr_reader :stderr
+  end
+end

data/lib/git/escaped_path.rb

@@ -42,7 +42,7 @@ module Git
     private
 
     def extract_octal(path, index)
-      [path[index + 1..index + 4].to_i(8), 4]
+      [path[index + 1..index + 3].to_i(8), 4]
     end
 
     def extract_escape(path, index)

data/lib/git/failed_error.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'git/git_execute_error'
+
+module Git
+  # This error is raised when a git command fails
+  #
+  # The git command executed, status, stdout, and stderr are available from this
+  # object. The #message includes the git command, the status of the process, and
+  # the stderr of the process.
+  #
+  # @api public
+  #
+  class FailedError < Git::GitExecuteError
+    # Create a FailedError object
+    #
+    # @example
+    #   `exit 1` # set $? appropriately for this example
+    #   result = Git::CommandLineResult.new(%w[git status], $?, '', "failed")
+    #   error = Git::FailedError.new(result)
+    #   error.message #=>
+    #     "[\"git\", \"status\"]\nstatus: pid 89784 exit 1\nstderr: \"failed\""
+    #
+    # @param result [Git::CommandLineResult] the result of the git command including
+    #   the git command, status, stdout, and stderr
+    #
+    def initialize(result)
+      super("#{result.git_cmd}\nstatus: #{result.status}\nstderr: #{result.stderr.inspect}")
+      @result = result
+    end
+
+    # @attribute [r] result
+    #
+    # The result of the git command including the git command and its status and output
+    #
+    # @example
+    #   `exit 1` # set $? appropriately for this example
+    #   result = Git::CommandLineResult.new(%w[git status], $?, '', "failed")
+    #   error = Git::FailedError.new(result)
+    #   error.result #=>
+    #     #<Git::CommandLineResult:0x00000001046bd488
+    #       @git_cmd=["git", "status"],
+    #       @status=#<Process::Status: pid 89784 exit 1>,
+    #       @stderr="failed",
+    #       @stdout="">
+    #
+    # @return [Git::CommandLineResult]
+    #
+    attr_reader :result
+  end
+end

data/lib/git/git_execute_error.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module Git
+  # This error is raised when a git command fails
+  #
+  class GitExecuteError < StandardError; end
+end

data/lib/git/lib.rb

@@ -1,11 +1,9 @@
+require 'git/failed_error'
+require 'logger'
 require 'tempfile'
 require 'zlib'
 
 module Git
-
-  class GitExecuteError < StandardError
-  end
-
   class Lib
 
     @@semaphore = Mutex.new
@@ -52,6 +50,7 @@ module Git
       @git_index_file = nil
       @git_work_dir = nil
       @path = nil
+      @logger = logger || Logger.new(nil)
 
       if base.is_a?(Git::Base)
         @git_dir = base.repo.path
@@ -62,7 +61,6 @@ module Git
         @git_index_file = base[:index]
         @git_work_dir = base[:working_directory]
       end
-      @logger = logger
     end
 
     # creates or reinitializes the repository
@@ -77,7 +75,7 @@ module Git
       arr_opts << '--bare' if opts[:bare]
       arr_opts << "--initial-branch=#{opts[:initial_branch]}" if opts[:initial_branch]
 
-      command('init', arr_opts)
+      command('init', *arr_opts)
     end
 
     # tries to clone the given repo
@@ -113,7 +111,7 @@ module Git
       arr_opts << repository_url
       arr_opts << clone_dir
 
-      command('clone', arr_opts)
+      command('clone', *arr_opts)
 
       return_base_opts_from_clone(clone_dir, opts)
     end
@@ -168,7 +166,7 @@ module Git
 
       arr_opts << committish if committish
 
-      return command('describe', arr_opts)
+      return command('describe', *arr_opts)
     end
 
     def log_commits(opts={})
@@ -178,7 +176,7 @@ module Git
 
       arr_opts += log_path_options(opts)
 
-      command_lines('log', arr_opts).map { |l| l.split.first }
+      command_lines('log', *arr_opts).map { |l| l.split.first }
     end
 
     def full_log_commits(opts={})
@@ -189,7 +187,7 @@ module Git
 
       arr_opts += log_path_options(opts)
 
-      full_log = command_lines('log', arr_opts)
+      full_log = command_lines('log', *arr_opts)
 
       process_commit_log_data(full_log)
     end
@@ -221,54 +219,57 @@ module Git
     def commit_data(sha)
       sha = sha.to_s
       cdata = command_lines('cat-file', 'commit', sha)
-      process_commit_data(cdata, sha, 0)
+      process_commit_data(cdata, sha)
     end
 
-    def process_commit_data(data, sha = nil, indent = 4)
+    def process_commit_data(data, sha)
       hsh = {
-        'sha'     => sha,
-        'message' => '',
-        'parent'  => []
+        'sha'    => sha,
+        'parent' => []
       }
 
-      loop do
-        key, *value = data.shift.split
-
-        break if key.nil?
-
+      each_cat_file_header(data) do |key, value|
         if key == 'parent'
-          hsh['parent'] << value.join(' ')
+          hsh['parent'] << value
         else
-          hsh[key] = value.join(' ')
+          hsh[key] = value
         end
       end
 
-      hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
+      hsh['message'] = data.join("\n") + "\n"
 
       return hsh
     end
 
+    CAT_FILE_HEADER_LINE = /\A(?<key>\w+) (?<value>.*)\z/
+
+    def each_cat_file_header(data)
+      while (match = CAT_FILE_HEADER_LINE.match(data.shift))
+        key = match[:key]
+        value_lines = [match[:value]]
+
+        while data.first.start_with?(' ')
+          value_lines << data.shift.lstrip
+        end
+
+        yield key, value_lines.join("\n")
+      end
+    end
+
     def tag_data(name)
       sha = sha.to_s
       tdata = command_lines('cat-file', 'tag', name)
-      process_tag_data(tdata, name, 0)
+      process_tag_data(tdata, name)
     end
 
-    def process_tag_data(data, name, indent=4)
-      hsh = {
-        'name'    => name,
-        'message' => ''
-      }
-
-      loop do
-        key, *value = data.shift.split
-
-        break if key.nil?
+    def process_tag_data(data, name)
+      hsh = { 'name' => name }
 
-        hsh[key] = value.join(' ')
+      each_cat_file_header(data) do |key, value|
+        hsh[key] = value
       end
 
-      hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
+      hsh['message'] = data.join("\n") + "\n"
 
       return hsh
     end
@@ -367,7 +368,7 @@ module Git
       # HEAD b8c63206f8d10f57892060375a86ae911fad356e
       # detached
       #
-      command_lines('worktree',['list', '--porcelain']).each do |w|
+      command_lines('worktree', 'list', '--porcelain').each do |w|
         s = w.split("\s")
         directory = s[1] if s[0] == 'worktree'
         arr << [directory, s[1]] if s[0] == 'HEAD'
@@ -376,16 +377,16 @@ module Git
     end
 
     def worktree_add(dir, commitish = nil)
-      return command('worktree', ['add', dir, commitish]) if !commitish.nil?
-      command('worktree', ['add', dir])
+      return command('worktree', 'add', dir, commitish) if !commitish.nil?
+      command('worktree', 'add', dir)
     end
 
     def worktree_remove(dir)
-      command('worktree', ['remove', dir])
+      command('worktree', 'remove', dir)
     end
 
     def worktree_prune
-      command('worktree', ['prune'])
+      command('worktree', 'prune')
     end
 
     def list_files(ref_dir)
@@ -400,7 +401,7 @@ module Git
     end
 
     def branch_contains(commit, branch_name="")
-      command("branch",  [branch_name, "--contains", commit])
+      command("branch",  branch_name, "--contains", commit)
     end
 
     # returns hash
@@ -412,13 +413,15 @@ module Git
       grep_opts = ['-n']
       grep_opts << '-i' if opts[:ignore_case]
       grep_opts << '-v' if opts[:invert_match]
+      grep_opts << '-E' if opts[:extended_regexp]
       grep_opts << '-e'
       grep_opts << string
       grep_opts << opts[:object] if opts[:object].is_a?(String)
-      grep_opts << '--' << opts[:path_limiter] if opts[:path_limiter].is_a? String
+      grep_opts.push('--', opts[:path_limiter]) if opts[:path_limiter].is_a?(String)
+      grep_opts.push('--', *opts[:path_limiter]) if opts[:path_limiter].is_a?(Array)
 
       hsh = {}
-      command_lines('grep', grep_opts).each do |line|
+      command_lines('grep', *grep_opts).each do |line|
         if m = /(.*?)\:(\d+)\:(.*)/.match(line)
           hsh[m[1]] ||= []
           hsh[m[1]] << [m[2].to_i, m[3]]
@@ -433,7 +436,7 @@ module Git
       diff_opts << obj2 if obj2.is_a?(String)
       diff_opts << '--' << opts[:path_limiter] if opts[:path_limiter].is_a? String
 
-      command('diff', diff_opts)
+      command('diff', *diff_opts)
     end
 
     def diff_stats(obj1 = 'HEAD', obj2 = nil, opts = {})
@@ -444,7 +447,7 @@ module Git
 
       hsh = {:total => {:insertions => 0, :deletions => 0, :lines => 0, :files => 0}, :files => {}}
 
-      command_lines('diff', diff_opts).each do |file|
+      command_lines('diff', *diff_opts).each do |file|
         (insertions, deletions, filename) = file.split("\t")
         hsh[:total][:insertions] += insertions.to_i
         hsh[:total][:deletions] += deletions.to_i
@@ -463,7 +466,7 @@ module Git
 
       opts_arr << '--' << opts[:path] if opts[:path]
 
-      command_lines('diff', opts_arr).inject({}) do |memo, line|
+      command_lines('diff', *opts_arr).inject({}) do |memo, line|
         status, path = line.split("\t")
         memo[path] = status
         memo
@@ -496,11 +499,11 @@ module Git
 
     def ls_remote(location=nil, opts={})
       arr_opts = []
-      arr_opts << ['--refs'] if opts[:refs]
+      arr_opts << '--refs' if opts[:refs]
       arr_opts << (location || '.')
 
       Hash.new{ |h,k| h[k] = {} }.tap do |hsh|
-        command_lines('ls-remote', arr_opts).each do |line|
+        command_lines('ls-remote', *arr_opts).each do |line|
           (sha, info) = line.split("\t")
           (ref, type, name) = info.split('/', 3)
           type ||= 'head'
@@ -581,7 +584,7 @@ module Git
 
       arr_opts << (path ? "#{objectish}:#{path}" : objectish)
 
-      command('show', arr_opts.compact, chomp: false)
+      command('show', *arr_opts.compact, chomp: false)
     end
 
     ## WRITE COMMANDS ##
@@ -622,7 +625,7 @@ module Git
 
       arr_opts.flatten!
 
-      command('add', arr_opts)
+      command('add', *arr_opts)
     end
 
     def remove(path = '.', opts = {})
@@ -636,7 +639,7 @@ module Git
         arr_opts << path
       end
 
-      command('rm', arr_opts)
+      command('rm', *arr_opts)
     end
 
     # Takes the commit message with the options and executes the commit command
@@ -678,14 +681,14 @@ module Git
         arr_opts << '--no-gpg-sign'
       end
 
-      command('commit', arr_opts)
+      command('commit', *arr_opts)
     end
 
     def reset(commit, opts = {})
       arr_opts = []
       arr_opts << '--hard' if opts[:hard]
       arr_opts << commit if commit
-      command('reset', arr_opts)
+      command('reset', *arr_opts)
     end
 
     def clean(opts = {})
@@ -695,7 +698,7 @@ module Git
       arr_opts << '-d' if opts[:d]
       arr_opts << '-x' if opts[:x]
 
-      command('clean', arr_opts)
+      command('clean', *arr_opts)
     end
 
     def revert(commitish, opts = {})
@@ -706,19 +709,19 @@ module Git
       arr_opts << '--no-edit' if opts[:no_edit]
       arr_opts << commitish
 
-      command('revert', arr_opts)
+      command('revert', *arr_opts)
     end
 
     def apply(patch_file)
       arr_opts = []
       arr_opts << '--' << patch_file if patch_file
-      command('apply', arr_opts)
+      command('apply', *arr_opts)
     end
 
     def apply_mail(patch_file)
       arr_opts = []
       arr_opts << '--' << patch_file if patch_file
-      command('am', arr_opts)
+      command('am', *arr_opts)
     end
 
     def stashes_all
@@ -736,24 +739,24 @@ module Git
     end
 
     def stash_save(message)
-      output = command('stash save', message)
+      output = command('stash', 'save', message)
       output =~ /HEAD is now at/
     end
 
     def stash_apply(id = nil)
       if id
-        command('stash apply', id)
+        command('stash', 'apply', id)
       else
-        command('stash apply')
+        command('stash', 'apply')
       end
     end
 
     def stash_clear
-      command('stash clear')
+      command('stash', 'clear')
     end
 
     def stash_list
-      command('stash list')
+      command('stash', 'list')
     end
 
     def branch_new(branch)
@@ -780,14 +783,14 @@ module Git
       arr_opts << branch
       arr_opts << opts[:start_point] if opts[:start_point] && arr_opts.include?('-b')
 
-      command('checkout', arr_opts)
+      command('checkout', *arr_opts)
     end
 
     def checkout_file(version, file)
       arr_opts = []
       arr_opts << version
       arr_opts << file
-      command('checkout', arr_opts)
+      command('checkout', *arr_opts)
     end
 
     def merge(branch, message = nil, opts = {})
@@ -795,8 +798,8 @@ module Git
       arr_opts << '--no-commit' if opts[:no_commit]
       arr_opts << '--no-ff' if opts[:no_ff]
       arr_opts << '-m' << message if message
-      arr_opts += [branch]
-      command('merge', arr_opts)
+      arr_opts += Array(branch)
+      command('merge', *arr_opts)
     end
 
     def merge_base(*args)
@@ -811,7 +814,7 @@ module Git
 
       arg_opts += args
 
-      command('merge-base', arg_opts).lines.map(&:strip)
+      command('merge-base', *arg_opts).lines.map(&:strip)
     end
 
     def unmerged
@@ -845,7 +848,7 @@ module Git
       arr_opts << name
       arr_opts << url
 
-      command('remote', arr_opts)
+      command('remote', *arr_opts)
     end
 
     def remote_set_url(name, url)
@@ -853,7 +856,7 @@ module Git
       arr_opts << name
       arr_opts << url
 
-      command('remote', arr_opts)
+      command('remote', *arr_opts)
     end
 
     def remote_remove(name)
@@ -890,7 +893,7 @@ module Git
         arr_opts << '-m' << (opts[:m] || opts[:message])
       end
 
-      command('tag', arr_opts)
+      command('tag', *arr_opts)
     end
 
     def fetch(remote, opts)
@@ -906,7 +909,7 @@ module Git
       arr_opts << remote if remote
       arr_opts << opts[:ref] if opts[:ref]
 
-      command('fetch', arr_opts)
+      command('fetch', *arr_opts)
     end
 
     def push(remote, branch = 'master', opts = {})
@@ -920,10 +923,10 @@ module Git
       arr_opts << remote
 
       if opts[:mirror]
-          command('push', arr_opts)
+          command('push', *arr_opts)
       else
-          command('push', arr_opts + [branch])
-          command('push', ['--tags'] + arr_opts) if opts[:tags]
+          command('push', *arr_opts, branch)
+          command('push', '--tags', *arr_opts) if opts[:tags]
       end
     end
 
@@ -951,7 +954,7 @@ module Git
       arr_opts = []
       arr_opts << "--prefix=#{opts[:prefix]}" if opts[:prefix]
       arr_opts += [treeish]
-      command('read-tree', arr_opts)
+      command('read-tree', *arr_opts)
     end
 
     def write_tree
@@ -968,7 +971,7 @@ module Git
       arr_opts << tree
       arr_opts << '-p' << opts[:parent] if opts[:parent]
       arr_opts += [opts[:parents]].map { |p| ['-p', p] }.flatten if opts[:parents]
-      command('commit-tree', arr_opts, redirect: "< #{escape t.path}")
+      command('commit-tree', *arr_opts, redirect: "< #{escape t.path}")
     end
 
     def update_ref(branch, commit)
@@ -982,7 +985,7 @@ module Git
       arr_opts << "--all" if opts[:all]
       arr_opts << '--' << opts[:path_limiter] if opts[:path_limiter].is_a? String
 
-      command('checkout-index', arr_opts)
+      command('checkout-index', *arr_opts)
     end
 
     # creates an archive file
@@ -1014,7 +1017,7 @@ module Git
       arr_opts << "--remote=#{opts[:remote]}" if opts[:remote]
       arr_opts << sha
       arr_opts << '--' << opts[:path] if opts[:path]
-      command('archive', arr_opts, redirect: " > #{escape file}")
+      command('archive', *arr_opts, redirect: " > #{escape file}")
       if opts[:add_gzip]
         file_content = File.read(file)
         Zlib::GzipWriter.open(file) do |gz|
@@ -1103,52 +1106,46 @@ module Git
       restore_git_system_env_variables()
     end
 
-    def command(cmd, *opts, &block)
+    def command(*cmd, redirect: '', chomp: true, &block)
       Git::Lib.warn_if_old_command(self)
 
-      command_opts = { chomp: true, redirect: '' }
-      if opts.last.is_a?(Hash)
-        command_opts.merge!(opts.pop)
-      end
-      command_opts.keys.each do |k|
-        raise ArgumentError.new("Unsupported option: #{k}") unless [:chomp, :redirect].include?(k)
-      end
+      raise 'cmd can not include a nested array' if cmd.any? { |o| o.is_a? Array }
 
       global_opts = []
       global_opts << "--git-dir=#{@git_dir}" if !@git_dir.nil?
       global_opts << "--work-tree=#{@git_work_dir}" if !@git_work_dir.nil?
-      global_opts << %w[-c core.quotePath=true]
-      global_opts << %w[-c color.ui=false]
+      global_opts << '-c' << 'core.quotePath=true'
+      global_opts << '-c' << 'color.ui=false'
 
-      opts = [opts].flatten.map {|s| escape(s) }.join(' ')
+      escaped_cmd = cmd.map { |part| escape(part) }.join(' ')
 
-      global_opts = global_opts.flatten.map {|s| escape(s) }.join(' ')
+      global_opts = global_opts.map { |s| escape(s) }.join(' ')
 
-      git_cmd = "#{Git::Base.config.binary_path} #{global_opts} #{cmd} #{opts} #{command_opts[:redirect]} 2>&1"
+      git_cmd = "#{Git::Base.config.binary_path} #{global_opts} #{escaped_cmd} #{redirect} 2>&1"
 
       output = nil
 
       command_thread = nil;
 
-      exitstatus = nil
+      status = nil
 
       with_custom_env_variables do
         command_thread = Thread.new do
           output = run_command(git_cmd, &block)
-          exitstatus = $?.exitstatus
+          status = $?
         end
         command_thread.join
       end
 
-      if @logger
-        @logger.info(git_cmd)
-        @logger.debug(output)
-      end
+      @logger.info(git_cmd)
+      @logger.debug(output)
 
-      raise Git::GitExecuteError, "#{git_cmd}:#{output}" if
-        exitstatus > 1 || (exitstatus == 1 && output != '')
+      if status.exitstatus > 1 || (status.exitstatus == 1 && output != '')
+        result = Git::CommandLineResult.new(git_cmd, status, output, '')
+        raise Git::FailedError.new(result)
+      end
 
-      output.chomp! if output && command_opts[:chomp] && !block_given?
+      output.chomp! if output && chomp && !block_given?
 
       output
     end
@@ -1161,7 +1158,7 @@ module Git
     def diff_as_hash(diff_command, opts=[])
       # update index before diffing to avoid spurious diffs
       command('status')
-      command_lines(diff_command, opts).inject({}) do |memo, line|
+      command_lines(diff_command, *opts).inject({}) do |memo, line|
         info, file = line.split("\t")
         mode_src, mode_dest, sha_src, sha_dest, type = info.split
 
@@ -1205,7 +1202,10 @@ module Git
       arr_opts = []
 
       arr_opts << opts[:object] if opts[:object].is_a? String
-      arr_opts << '--' << opts[:path_limiter] if opts[:path_limiter]
+      if opts[:path_limiter]
+        arr_opts << '--'
+        arr_opts += Array(opts[:path_limiter])
+      end
       arr_opts
     end
 

data/lib/git/signaled_error.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require 'git/git_execute_error'
+
+module Git
+  # This error is raised when a git command exits because of an uncaught signal
+  #
+  # The git command executed, status, stdout, and stderr are available from this
+  # object. The #message includes the git command, the status of the process, and
+  # the stderr of the process.
+  #
+  # @api public
+  #
+  class SignaledError < Git::GitExecuteError
+    # Create a SignaledError object
+    #
+    # @example
+    #   `kill -9 $$` # set $? appropriately for this example
+    #   result = Git::CommandLineResult.new(%w[git status], $?, '', "killed")
+    #   error = Git::SignaledError.new(result)
+    #   error.message #=>
+    #     "[\"git\", \"status\"]\nstatus: pid 88811 SIGKILL (signal 9)\nstderr: \"killed\""
+    #
+    # @param result [Git::CommandLineResult] the result of the git command including the git command, status, stdout, and stderr
+    #
+    def initialize(result)
+      super("#{result.git_cmd}\nstatus: #{result.status}\nstderr: #{result.stderr.inspect}")
+      @result = result
+    end
+
+    # @attribute [r] result
+    #
+    # The result of the git command including the git command, status, and output
+    #
+    # @example
+    #   `kill -9 $$` # set $? appropriately for this example
+    #   result = Git::CommandLineResult.new(%w[git status], $?, '', "killed")
+    #   error = Git::SignaledError.new(result)
+    #   error.result #=>
+    #     #<Git::CommandLineResult:0x000000010470f6e8
+    #       @git_cmd=["git", "status"],
+    #       @status=#<Process::Status: pid 88811 SIGKILL (signal 9)>,
+    #       @stderr="killed",
+    #       @stdout="">
+    #
+    # @return [Git::CommandLineResult]
+    #
+    attr_reader :result
+  end
+end

data/lib/git/version.rb

@@ -1,5 +1,5 @@
 module Git
   # The current gem version
   # @return [String] the current gem version.
-  VERSION='1.13.1'
+  VERSION='1.14.0'
 end

data/lib/git.rb

@@ -7,10 +7,13 @@ require 'git/author'
 require 'git/base'
 require 'git/branch'
 require 'git/branches'
+require 'git/command_line_result'
 require 'git/config'
 require 'git/diff'
 require 'git/encoding_utils'
 require 'git/escaped_path'
+require 'git/failed_error'
+require 'git/git_execute_error'
 require 'git/index'
 require 'git/lib'
 require 'git/log'
@@ -18,6 +21,7 @@ require 'git/object'
 require 'git/path'
 require 'git/remote'
 require 'git/repository'
+require 'git/signaled_error'
 require 'git/status'
 require 'git/stash'
 require 'git/stashes'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.14.0
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -189,10 +189,13 @@ files:
 - lib/git/base/factory.rb
 - lib/git/branch.rb
 - lib/git/branches.rb
+- lib/git/command_line_result.rb
 - lib/git/config.rb
 - lib/git/diff.rb
 - lib/git/encoding_utils.rb
 - lib/git/escaped_path.rb
+- lib/git/failed_error.rb
+- lib/git/git_execute_error.rb
 - lib/git/index.rb
 - lib/git/lib.rb
 - lib/git/log.rb
@@ -200,6 +203,7 @@ files:
 - lib/git/path.rb
 - lib/git/remote.rb
 - lib/git/repository.rb
+- lib/git/signaled_error.rb
 - lib/git/stash.rb
 - lib/git/stashes.rb
 - lib/git/status.rb
@@ -231,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 1.6.0.0, or greater
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories