git 1.17.1 → 1.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c893cd566fdfc36e3f6ea4fc742d7665b5daf14c299ff1acd19c40de49e3eb2
-  data.tar.gz: cc08038a56beb1ba3195600e80a666d66a7d58dd1abb16d4e5282718cd067bcd
+  metadata.gz: cebf2eab3cc2c8cc605b1e3b9aeafa2f2c82ef0a50be725fc211fdb55a7980c0
+  data.tar.gz: 9df1a5d2f067aa183a65cea1cd21e7260b72213f92c50b60bda26f261b2e7d23
 SHA512:
-  metadata.gz: 82e6441de9ff798080bddc79ca411386a7c20b5d4208d584fa12925777bb66de1ddc3532d512087eb815c083184d30cf445ef097a47cc8a8089027b1498820c1
-  data.tar.gz: f0657f1ee3f3142612fdd904bc8649207e6bc1a115cbb3a969105c99a0fff15c0d1851b755c527351f06b462e6ff22b98e85ed4139acdcdcf949c434417becb2
+  metadata.gz: 57019fb39b7476d7ee5d97fd1c21f1bffa3b1fbd59413e5bb602794c106f38c2bc528c1a86b98b89bc835976671ea836a1bdf911aa9a281b81b97d221c12b80d
+  data.tar.gz: d2f2927fbdf6b13b66d931183d6effb5fbb651e10c77a393e6b035ccc88e5b6ffd60dbed859fa6c400cd4551df253be89074e20aaa0f40379b609e79bd3553fa

data/CHANGELOG.md

@@ -5,6 +5,14 @@
 
 # Change Log
 
+## v1.17.2 (2023-03-07)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.17.1..v1.17.2)
+
+Changes since v1.17.1:
+
+* f43d6 Fix branch name parsing to handle names that include slashes (#651)
+
 ## v1.17.1 (2023-03-06)
 
 [Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.17.0..v1.17.1)

data/lib/git/branch.rb

@@ -1,11 +1,9 @@
 require 'git/path'
 
 module Git
-
   class Branch < Path
-    
     attr_accessor :full, :remote, :name
-    
+
     def initialize(base, name)
       @full = name
       @base = base
@@ -13,25 +11,25 @@ module Git
       @stashes = nil
       @remote, @name = parse_name(name)
     end
-    
+
     def gcommit
       @gcommit ||= @base.gcommit(@full)
       @gcommit
     end
-    
+
     def stashes
       @stashes ||= Git::Stashes.new(@base)
     end
-    
+
     def checkout
       check_if_create
       @base.checkout(@full)
     end
-    
+
     def archive(file, opts = {})
       @base.lib.archive(@full, file, opts)
     end
-    
+
     # g.branch('new_branch').in_branch do
     #   # create new file
     #   # do other stuff
@@ -47,26 +45,26 @@ module Git
       end
       @base.checkout(old_current)
     end
-    
+
     def create
       check_if_create
     end
-    
+
     def delete
       @base.lib.branch_delete(@name)
     end
-    
+
     def current
       determine_current
     end
-    
+
     def contains?(commit)
       !@base.lib.branch_contains(commit, self.name).empty?
     end
-    
+
     def merge(branch = nil, message = nil)
       if branch
-        in_branch do 
+        in_branch do
           @base.merge(branch, message)
           false
         end
@@ -76,7 +74,7 @@ module Git
         @base.merge(@name)
       end
     end
-    
+
     def update_ref(commit)
       if @remote
         @base.lib.update_ref("refs/remotes/#{@remote.name}/#{@name}", commit)
@@ -84,47 +82,62 @@ module Git
         @base.lib.update_ref("refs/heads/#{@name}", commit)
       end
     end
-    
+
     def to_a
       [@full]
     end
-    
+
     def to_s
       @full
     end
-    
-    private 
 
-      def check_if_create
-        @base.lib.branch_new(@name) rescue nil
-      end
-      
-      def determine_current
-        @base.lib.branch_current == @name
-      end
-    
-      # Given a full branch name return an Array containing the remote and branch names.
-      #
-      # Removes 'remotes' from the beggining of the name (if present).
-      # Takes the second part (splittign by '/') as the remote name.
-      # Takes the rest as the repo name (can also hold one or more '/').
-      #
-      # Example:
-      #   parse_name('master') #=> [nil, 'master']
-      #   parse_name('origin/master') #=> ['origin', 'master']
-      #   parse_name('remotes/origin/master') #=> ['origin', 'master']
-      #   parse_name('origin/master/v2') #=> ['origin', 'master/v2'] 
-      #
-      # 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\/)?([^\/]+)\/(.+)/)
-          return [Git::Remote.new(@base, $1), $2]
-        end
+    private
 
-        return [nil, name]
-      end
-    
+    def check_if_create
+      @base.lib.branch_new(@name) rescue nil
+    end
+
+    def determine_current
+      @base.lib.branch_current == @name
+    end
+
+    BRANCH_NAME_REGEXP = %r{
+      ^
+        # Optional 'refs/remotes/' at the beggining to specify a remote tracking branch
+        # with a <remote_name>. <remote_name> is nil if not present.
+        (?:
+          (?:(?:refs/)?remotes/)(?<remote_name>[^/]+)/
+        )?
+        (?<branch_name>.*)
+      $
+    }x
+
+    # Given a full branch name return an Array containing the remote and branch names.
+    #
+    # Removes 'remotes' from the beggining of the name (if present).
+    # Takes the second part (splittign by '/') as the remote name.
+    # Takes the rest as the repo name (can also hold one or more '/').
+    #
+    # Example:
+    #   # local branches
+    #   parse_name('master') #=> [nil, 'master']
+    #   parse_name('origin/master') #=> [nil, 'origin/master']
+    #   parse_name('origin/master/v2') #=> [nil, 'origin/master']
+    #
+    #   # remote branches
+    #   parse_name('remotes/origin/master') #=> ['origin', 'master']
+    #   parse_name('remotes/origin/master/v2') #=> ['origin', 'master/v2']
+    #   parse_name('refs/remotes/origin/master') #=> ['origin', 'master']
+    #   parse_name('refs/remotes/origin/master/v2') #=> ['origin', 'master/v2']
+    #
+    # param [String] name branch full name.
+    # return [<Git::Remote,NilClass,String>] an Array containing the remote and branch names.
+    def parse_name(name)
+      # Expect this will always match
+      match = name.match(BRANCH_NAME_REGEXP)
+      remote = match[:remote_name] ? Git::Remote.new(@base, match[:remote_name]) : nil
+      branch_name = match[:branch_name]
+      [ remote, branch_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.17.1'
+  VERSION='1.17.2'
 end

metadata

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