git 1.13.2 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29b8c6b76f613f41bcddf2786fe9b164ef2168f265f3b8fdccb9f8f4ead52669
-  data.tar.gz: b0f66b11fd1a2eba3640bfa42ff842dcfbd52ab30455026b97ebecad8fd86f0c
+  metadata.gz: 8a3877a2258c4835e6adc9ad9844f89eeaf340bf1ad7a47937178fc4abe4bfae
+  data.tar.gz: 4bc93c337d92610aa46c7265fb03cfff12ca62d23fcfe67488e5ffaf0dd171cb
 SHA512:
-  metadata.gz: bb85d50e45a905b7e71617da29f6194e478b17aed237237e0dd53066a5182c328d4e992494a3b7d26df47223c0e601733400e62d04b7e9fffdf8993c22cd2fb5
-  data.tar.gz: ee9d9edbd87615caee4cc073acd2df9a047b46d5ba117997f193a98d28374d214e2994018d3bed10c0e4acad7cd913ba39da25ecc2b0fd973863930f19d0f129
+  metadata.gz: 89caa1ce17512244548e72fcac709390c8017601e7699d6355939d613c8cba973c5309c733d4071d5db356d93f9fe37b42e3ca48862e759c00fdbf85b55eb51f
+  data.tar.gz: fff185e87d3925baed674a81b3501dba49a9e9c8af1e1f99fdb27645c83a5a22e820001ab46a49a71e703b0dcb741d5a6aa8baeddf2dd4c39fa6199443a8190e

data/CHANGELOG.md

@@ -5,6 +5,34 @@
 
 # Change Log
 
+## v1.15.0 (2023-03-01)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.14.0..v1.15.0)
+
+Changes since v1.14.0:
+
+* b40d #pull with no options should do the same thing as `git pull` with no options (#633)
+* 9c5e Fix error when calling `Git::Lib#remove` with `recursive` or `cached` options (#632)
+* 806e Add Git::Log#all option (#630)
+* d905 Allow a repo to be opened giving a non-root repo directory (#629)
+* 1ccd Rewrite worktree tests (#628)
+* 4409 Fix Git::Branch#update_ref (#626)
+
+## 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)

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/README.md

@@ -66,6 +66,10 @@ like:
 
  `@git.log(20).object("some_file").since("2 weeks ago").between('v2.6', 'v2.7').each { |commit| [block] }`
 
+Pass the `--all` option to `git log` as follows:
+
+ `@git.log.all.each { |commit| [block] }`
+
  **Git::Worktrees** - Enumerable object that holds `Git::Worktree objects`.
 
 ## Examples

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.
@@ -57,9 +58,26 @@ module Git
       self.new(options)
     end
 
+    def self.root_of_worktree(working_dir)
+      result = working_dir
+      status = nil
+      Dir.chdir(working_dir) do
+        git_cmd = "#{Git::Base.config.binary_path} -c core.quotePath=true -c color.ui=false rev-parse --show-toplevel 2>&1"
+        result = `#{git_cmd}`.chomp
+        status = $?
+      end
+      raise ArgumentError, "'#{working_dir}' is not in a git working tree" unless status.success?
+      result
+    end
+
     # (see Git.open)
     def self.open(working_dir, options = {})
+      raise ArgumentError, "'#{working_dir}' is not a directory" unless Dir.exist?(working_dir)
+
+      working_dir = root_of_worktree(working_dir) unless options[:repository]
+
       normalize_paths(options, default_working_directory: working_dir)
+
       self.new(options)
     end
 
@@ -90,12 +108,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 +226,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
     #   {
@@ -249,10 +272,12 @@ module Git
     end
 
     # removes file(s) from the git repository
-    def remove(path = '.', opts = {})
-      self.lib.remove(path, opts)
+    def rm(path = '.', opts = {})
+      self.lib.rm(path, opts)
     end
 
+    alias remove rm
+
     # resets the working directory to the provided commitish
     def reset(commitish = nil, opts = {})
       self.lib.reset(commitish, opts)
@@ -374,7 +399,7 @@ module Git
     #  @git.pull('upstream')              # pulls from upstream/master
     #  @git.pull('upstream', 'develope')  # pulls from upstream/develop
     #
-    def pull(remote='origin', branch='master')
+    def pull(remote = nil, branch = nil)
       self.lib.pull(remote, branch)
     end
 

data/lib/git/branch.rb

@@ -78,7 +78,11 @@ module Git
     end
     
     def update_ref(commit)
-      @base.lib.update_ref(@full, commit)
+      if @remote
+        @base.lib.update_ref("refs/remotes/#{@remote.name}/#{@name}", commit)
+      else
+        @base.lib.update_ref("refs/heads/#{@name}", commit)
+      end
     end
     
     def to_a
@@ -114,7 +118,7 @@ module Git
       # param [String] name branch full name.
       # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names. 
       def parse_name(name)
-        if name.match(/^(?:remotes)?\/([^\/]+)\/(.+)/)
+        if name.match(/^(?:remotes\/)?([^\/]+)\/(.+)/)
           return [Git::Remote.new(@base, $1), $2]
         end
 

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/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
@@ -370,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'
@@ -379,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)
@@ -403,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
@@ -415,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]]
@@ -436,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 = {})
@@ -447,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
@@ -466,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
@@ -499,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'
@@ -584,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 ##
@@ -625,21 +625,17 @@ module Git
 
       arr_opts.flatten!
 
-      command('add', arr_opts)
+      command('add', *arr_opts)
     end
 
-    def remove(path = '.', opts = {})
+    def rm(path = '.', opts = {})
       arr_opts = ['-f']  # overrides the up-to-date check by default
-      arr_opts << ['-r'] if opts[:recursive]
-      arr_opts << ['--cached'] if opts[:cached]
+      arr_opts << '-r' if opts[:recursive]
+      arr_opts << '--cached' if opts[:cached]
       arr_opts << '--'
-      if path.is_a?(Array)
-        arr_opts += path
-      else
-        arr_opts << path
-      end
+      arr_opts += Array(path)
 
-      command('rm', arr_opts)
+      command('rm', *arr_opts)
     end
 
     # Takes the commit message with the options and executes the commit command
@@ -681,14 +677,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 = {})
@@ -698,7 +694,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 = {})
@@ -709,19 +705,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
@@ -739,24 +735,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)
@@ -783,14 +779,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 = {})
@@ -798,8 +794,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)
@@ -814,7 +810,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
@@ -848,7 +844,7 @@ module Git
       arr_opts << name
       arr_opts << url
 
-      command('remote', arr_opts)
+      command('remote', *arr_opts)
     end
 
     def remote_set_url(name, url)
@@ -856,7 +852,7 @@ module Git
       arr_opts << name
       arr_opts << url
 
-      command('remote', arr_opts)
+      command('remote', *arr_opts)
     end
 
     def remote_remove(name)
@@ -893,7 +889,7 @@ module Git
         arr_opts << '-m' << (opts[:m] || opts[:message])
       end
 
-      command('tag', arr_opts)
+      command('tag', *arr_opts)
     end
 
     def fetch(remote, opts)
@@ -909,7 +905,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 = {})
@@ -923,15 +919,20 @@ 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
 
-    def pull(remote='origin', branch='master')
-      command('pull', remote, branch)
+    def pull(remote = nil, branch = nil)
+      raise ArgumentError, "You must specify a remote if a branch is specified" if remote.nil? && !branch.nil?
+
+      arr_opts = []
+      arr_opts << remote if remote
+      arr_opts << branch if branch
+      command('pull', *arr_opts)
     end
 
     def tag_sha(tag_name)
@@ -954,7 +955,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
@@ -971,11 +972,11 @@ 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)
-      command('update-ref', branch, commit)
+    def update_ref(ref, commit)
+      command('update-ref', ref, commit)
     end
 
     def checkout_index(opts = {})
@@ -985,7 +986,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
@@ -1017,7 +1018,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|
@@ -1106,52 +1107,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
@@ -1164,7 +1159,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
 
@@ -1188,7 +1183,12 @@ module Git
     def log_common_options(opts)
       arr_opts = []
 
-      arr_opts << "-#{opts[:count]}" if opts[:count]
+      if opts[:count] && !opts[:count].is_a?(Integer)
+        raise ArgumentError, "The log count option must be an Integer but was #{opts[:count].inspect}"
+      end
+
+      arr_opts << "--max-count=#{opts[:count]}" if opts[:count]
+      arr_opts << "--all" if opts[:all]
       arr_opts << "--no-color"
       arr_opts << "--cherry" if opts[:cherry]
       arr_opts << "--since=#{opts[:since]}" if opts[:since].is_a? String
@@ -1208,7 +1208,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/log.rb

@@ -1,24 +1,19 @@
 module Git
-  
+
   # object that holds the last X commits on given branch
   class Log
     include Enumerable
-    
+
     def initialize(base, count = 30)
       dirty_log
       @base = base
       @count = count
- 
-      @commits = nil
-      @author = nil
-      @grep = nil
-      @object = nil
-      @path = nil
-      @since = nil
-      @skip = nil
-      @until = nil
-      @between = nil
-      @cherry = nil
+    end
+
+    def all
+      dirty_log
+      @all = true
+      self
     end
 
     def object(objectish)
@@ -32,37 +27,37 @@ module Git
       @author = regex
       return self
     end
-        
+
     def grep(regex)
       dirty_log
       @grep = regex
       return self
     end
-    
+
     def path(path)
       dirty_log
       @path = path
       return self
     end
-    
+
     def skip(num)
       dirty_log
       @skip = num
       return self
     end
-    
+
     def since(date)
       dirty_log
       @since = date
       return self
     end
-    
+
     def until(date)
       dirty_log
       @until = date
       return self
     end
-    
+
     def between(sha1, sha2 = nil)
       dirty_log
       @between = [sha1, sha2]
@@ -74,24 +69,24 @@ module Git
       @cherry = true
       return self
     end
-    
+
     def to_s
       self.map { |c| c.to_s }.join("\n")
     end
-    
+
 
     # forces git log to run
-    
+
     def size
       check_log
       @commits.size rescue nil
     end
-    
+
     def each(&block)
       check_log
       @commits.each(&block)
     end
-    
+
     def first
       check_log
       @commits.first rescue nil
@@ -107,29 +102,30 @@ module Git
       @commits[index] rescue nil
     end
 
-    
-    private 
-    
+
+    private
+
       def dirty_log
         @dirty_flag = true
       end
-      
+
       def check_log
         if @dirty_flag
           run_log
           @dirty_flag = false
         end
       end
-      
+
       # actually run the 'git log' command
-      def run_log      
-        log = @base.lib.full_log_commits(:count => @count, :object => @object, 
-                                    :path_limiter => @path, :since => @since, 
-                                    :author => @author, :grep => @grep, :skip => @skip,
-                                    :until => @until, :between => @between, :cherry => @cherry)
+      def run_log
+        log = @base.lib.full_log_commits(
+          count: @count, all: @all, object: @object, path_limiter: @path, since: @since,
+          author: @author, grep: @grep, skip: @skip, until: @until, between: @between,
+          cherry: @cherry
+        )
         @commits = log.map { |c| Git::Object::Commit.new(@base, c['sha'], c) }
       end
-      
+
   end
-  
+
 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.2'
+  VERSION='1.15.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.2
+  version: 1.15.0
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-02 00:00:00.000000000 Z
+date: 2023-03-01 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