git 1.15.0 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a3877a2258c4835e6adc9ad9844f89eeaf340bf1ad7a47937178fc4abe4bfae
-  data.tar.gz: 4bc93c337d92610aa46c7265fb03cfff12ca62d23fcfe67488e5ffaf0dd171cb
+  metadata.gz: 06d2809c51685e3171199f0eb8bce4c02a7970d61d12fabbde7bf2ab3850a86b
+  data.tar.gz: 439eac61b04b8fcdafa739f7f6f27cfc89f00d557aac52aacd6f71762bc8281e
 SHA512:
-  metadata.gz: 89caa1ce17512244548e72fcac709390c8017601e7699d6355939d613c8cba973c5309c733d4071d5db356d93f9fe37b42e3ca48862e759c00fdbf85b55eb51f
-  data.tar.gz: fff185e87d3925baed674a81b3501dba49a9e9c8af1e1f99fdb27645c83a5a22e820001ab46a49a71e703b0dcb741d5a6aa8baeddf2dd4c39fa6199443a8190e
+  metadata.gz: 57db3b512e1d30130f1ab8bf9f77a701591c4c05c8c9fe35e9d047329cc7fe08b6e17c93d276bcfbfcb3e5c92a8dcb48cc571d513a7a981d69989eac7daea957
+  data.tar.gz: ee2b51658bda3767a01729888c60b677d79d69b75fadb8659a6d56144e82f51e21da817f7f310b1af0be9baedda37923315adac10ad7a65be1624b6ecb0628fb

data/CHANGELOG.md

@@ -5,6 +5,20 @@
 
 # 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)

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/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

@@ -350,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
@@ -374,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

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
@@ -772,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)
@@ -908,20 +942,36 @@ 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

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.15.0'
+  VERSION='1.16.0'
 end

metadata

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