git 1.14.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 344c98cd98670d4afa26aae12680f28ad857f1fdbca4384a10c9cf7ed7937a8a
-  data.tar.gz: 9d857e44f2457f6c5208bebca6935991c2e88fbd82b2c482c570cd7afcca7c38
+  metadata.gz: 06d2809c51685e3171199f0eb8bce4c02a7970d61d12fabbde7bf2ab3850a86b
+  data.tar.gz: 439eac61b04b8fcdafa739f7f6f27cfc89f00d557aac52aacd6f71762bc8281e
 SHA512:
-  metadata.gz: 6fd40652aa02ad36238522ee2210ad7c01ced240f0a1b91f2de3e6baefe93dd0a20fb22b80821ee45bf974d73a3cc346e4a5adbaa2322384b57e2bb0251d491d
-  data.tar.gz: 0c8d86fe09a9e4f8d06c1d8bb0abf05eff45a2746450253ccf751163e4340b873df4eff2dbfb0711aad30c61303e0c692802a378bceb46a26a1e17ba08927268
+  metadata.gz: 57db3b512e1d30130f1ab8bf9f77a701591c4c05c8c9fe35e9d047329cc7fe08b6e17c93d276bcfbfcb3e5c92a8dcb48cc571d513a7a981d69989eac7daea957
+  data.tar.gz: ee2b51658bda3767a01729888c60b677d79d69b75fadb8659a6d56144e82f51e21da817f7f310b1af0be9baedda37923315adac10ad7a65be1624b6ecb0628fb

data/CHANGELOG.md

@@ -5,6 +5,33 @@
 
 # Change Log
 
+## v1.16.0 (2023-03-03)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.15.0..v1.16.0)
+
+Changes since v1.15.0:
+
+* 536d Fix parsing when in detached HEAD state in Git::Lib#branches_all (#641)
+* 5c68 Fix parsing of symbolic refs in `Git::Lib#branches_all` (#640)
+* 7d88 Remote#branch and #merge should default to current branch instead of "master" (#639)
+* 3dda0 `#branch` name should default to current branch instead of `master` (#638)
+* d33d #checkout without args should do same as `git checkout` with no args (#637)
+* 0c90 #push without args should do same as `git push` with no args (#636)
+* 2b19 Make it easier to run test files from the command line (#635)
+
+## 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)

data/CONTRIBUTING.md

@@ -84,11 +84,11 @@ In order to ensure high quality, all pull requests must meet these requirements:
 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 a single file (from tests/units):
+    $ bin/test test_object
 
     # run multiple files:
-    $ bin/test tests/units/test_object.rb tests/units/test_archive.rb
+    $ bin/test test_object test_archive
 
     # run all unit tests:
     $ bin/test

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/lib/git/base/factory.rb

@@ -3,9 +3,8 @@ module Git
   class Base
 
     module Factory
-
       # @return [Git::Branch] an object for branch_name
-      def branch(branch_name = 'master')
+      def branch(branch_name = self.current_branch)
         Git::Branch.new(self, branch_name)
       end
 
@@ -93,7 +92,6 @@ module Git
         shas = self.lib.merge_base(*args)
         shas.map { |sha| gcommit(sha) }
       end
-
     end
 
   end

data/lib/git/base.rb

@@ -58,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
 
@@ -255,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)
@@ -331,8 +350,8 @@ module Git
     end
 
     # checks out a branch as the new git working directory
-    def checkout(branch = 'master', opts = {})
-      self.lib.checkout(branch, opts)
+    def checkout(*args, **options)
+      self.lib.checkout(*args, **options)
     end
 
     # checks out an old version of a file
@@ -355,11 +374,8 @@ module Git
     #
     #  @git.config('remote.remote-name.push', 'refs/heads/master:refs/heads/master')
     #
-    def push(remote = 'origin', branch = 'master', opts = {})
-      # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
-      opts = {:tags => opts} if [true, false].include?(opts)
-
-      self.lib.push(remote, branch, opts)
+    def push(*args, **options)
+      self.lib.push(*args, **options)
     end
 
     # merges one or more branches into the current working branch
@@ -380,7 +396,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/lib.rb

@@ -347,13 +347,42 @@ module Git
       command('symbolic-ref', 'HEAD', "refs/heads/#{branch_name}")
     end
 
+    BRANCH_LINE_REGEXP = /
+      ^
+        # Prefix indicates if this branch is checked out. The prefix is one of:
+        (?:
+          (?<current>\*[[:blank:]]) |  # Current branch (checked out in the current worktree)
+          (?<worktree>\+[[:blank:]]) | # Branch checked out in a different worktree
+          [[:blank:]]{2}               # Branch not checked out
+        )
+
+        # The branch's full refname
+        (?:
+          (?<not_a_branch>\(not[[:blank:]]a[[:blank:]]branch\)) |
+          (?:\(HEAD[[:blank:]]detached[[:blank:]]at[[:blank:]](?<detached_ref>[^\)]+)\)) |
+          (?<refname>[^[[:blank:]]]+)
+        )
+
+        # Optional symref
+        # If this ref is a symbolic reference, this is the ref referenced
+        (?:
+          [[:blank:]]->[[:blank:]](?<symref>.*)
+        )?
+      $
+    /x
+
     def branches_all
-      arr = []
-      command_lines('branch', '-a').each do |b|
-        current = (b[0, 2] == '* ')
-        arr << [b.gsub('* ', '').strip, current]
-      end
-      arr
+      command_lines('branch', '-a').map do |line|
+        match_data = line.match(BRANCH_LINE_REGEXP)
+        raise GitExecuteError, 'Unexpected branch line format' unless match_data
+        next nil if match_data[:not_a_branch] || match_data[:detached_ref]
+        [
+          match_data[:refname],
+          !match_data[:current].nil?,
+          !match_data[:worktree].nil?,
+          match_data[:symref]
+        ]
+      end.compact
     end
 
     def worktrees_all
@@ -628,16 +657,12 @@ module Git
       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)
     end
@@ -776,11 +801,16 @@ module Git
     #
     # @param [String] branch
     # @param [Hash] opts
-    def checkout(branch, opts = {})
+    def checkout(branch = nil, opts = {})
+      if branch.is_a?(Hash) && opts == {}
+        opts = branch
+        branch = nil
+      end
+
       arr_opts = []
       arr_opts << '-b' if opts[:new_branch] || opts[:b]
       arr_opts << '--force' if opts[:force] || opts[:f]
-      arr_opts << branch
+      arr_opts << branch if branch
       arr_opts << opts[:start_point] if opts[:start_point] && arr_opts.include?('-b')
 
       command('checkout', *arr_opts)
@@ -912,26 +942,47 @@ module Git
       command('fetch', *arr_opts)
     end
 
-    def push(remote, branch = 'master', opts = {})
+    def push(remote = nil, branch = nil, opts = nil)
+      if opts.nil? && branch.instance_of?(Hash)
+        opts = branch
+        branch = nil
+      end
+
+      if opts.nil? && remote.instance_of?(Hash)
+        opts = remote
+        remote = nil
+      end
+
+      opts ||= {}
+
       # Small hack to keep backwards compatibility with the 'push(remote, branch, tags)' method signature.
       opts = {:tags => opts} if [true, false].include?(opts)
 
+      raise ArgumentError, "You must specify a remote if a branch is specified" if remote.nil? && !branch.nil?
+
       arr_opts = []
       arr_opts << '--mirror'  if opts[:mirror]
       arr_opts << '--delete'  if opts[:delete]
       arr_opts << '--force'  if opts[:force] || opts[:f]
-      arr_opts << remote
+      arr_opts << remote if remote
+      arr_opts_with_branch = arr_opts.dup
+      arr_opts_with_branch << branch if branch
 
       if opts[:mirror]
-          command('push', *arr_opts)
+          command('push', *arr_opts_with_branch)
       else
-          command('push', *arr_opts, branch)
+          command('push', *arr_opts_with_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)
@@ -974,8 +1025,8 @@ module Git
       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 = {})
@@ -1182,7 +1233,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

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/remote.rb

@@ -1,8 +1,8 @@
 module Git
   class Remote < Path
-    
+
     attr_accessor :name, :url, :fetch_opts
-    
+
     def initialize(base, name)
       @base = base
       config = @base.lib.config_remote(name)
@@ -10,27 +10,29 @@ module Git
       @url = config['url']
       @fetch_opts = config['fetch']
     end
-    
+
     def fetch(opts={})
       @base.fetch(@name, opts)
     end
-    
+
     # merge this remote locally
-    def merge(branch = 'master')
-      @base.merge("#{@name}/#{branch}")
+    def merge(branch = @base.current_branch)
+      remote_tracking_branch = "#{@name}/#{branch}"
+      @base.merge(remote_tracking_branch)
     end
-    
-    def branch(branch = 'master')
-      Git::Branch.new(@base, "#{@name}/#{branch}")
+
+    def branch(branch = @base.current_branch)
+      remote_tracking_branch = "#{@name}/#{branch}"
+      Git::Branch.new(@base, remote_tracking_branch)
     end
-    
+
     def remove
-      @base.lib.remote_remove(@name)     
+      @base.lib.remote_remove(@name)
     end
-    
+
     def to_s
       @name
     end
-    
+
   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.14.0'
+  VERSION='1.16.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.16.0
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-26 00:00:00.000000000 Z
+date: 2023-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable