git 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b62df99d178044fd3fe000a27475819f27bcede65dd96bbc884e1a9eb766df86
-  data.tar.gz: 37330af1ce4f2b8f0ea372cbb36fe32991ab93f5243dbe91589a045f7c5073cf
+  metadata.gz: f4c3080ee5b1fd4b591abe1e3e94917ea4307c97a3cf75f93cbc910e5320142b
+  data.tar.gz: 1b5a4682825b282577918929d21967846191fdcf16a8dc3c72de71820fee74f9
 SHA512:
-  metadata.gz: 6a10a88c4cc04970184c9f5e1eda87dfc4778366498a867931be7196de1a0d882b5d9a7c552249d384ad46e7e1dee2c1077aff1d3ea31e5b53254dbe099e781b
-  data.tar.gz: 76d10cc88dfd8150daaf6f53f1af46077345fa35a64b71c8f6276e388503f1f15fee173dca322ae49c7fb511ebe5d44dc43dd84b15a9a234e2b06aea627e7032
+  metadata.gz: 57434c5742779e9769f3a6ce85a5b25c5f3c4e5974427965bca0df4922a266ffb3225839ccf2964f2391d5b8c7eda68de4aa1d46bbbd264b6d5c53a2c7852f77
+  data.tar.gz: 6c1a1bc6010f883eb8b0d4ccd677a5f46c98db9f3f9e582b8c06f6b4294903c1949fe288fe2ae2c17c41ae9e5319fdc9fc64870e5f3f1219b03351a22f475d4c

data/CHANGELOG.md

@@ -5,6 +5,14 @@
 
 # Change Log
 
+## v2.3.2 (2024-11-19)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v2.3.1..v2.3.2)
+
+Changes since v2.3.1:
+
+* 7646e38 fix: improve error message for Git::Lib#branches_all
+
 ## v2.3.1 (2024-10-23)
 
 [Full Changelog](https://github.com/ruby-git/ruby-git/compare/v2.3.0..v2.3.1)

data/lib/git/lib.rb

@@ -362,7 +362,7 @@ module Git
     #
     # @example Get the contents of a file with a block
     #  lib.cat_file_contents('README.md') { |f| f.read } # => "This is a README file\n"
-    #  
+    #
     # @param object [String] the object whose contents to return
     #
     # @return [String] the object contents
@@ -641,10 +641,13 @@ module Git
     /x
 
     def branches_all
-      command_lines('branch', '-a').map do |line|
+      lines = command_lines('branch', '-a')
+      lines.each_with_index.map do |line, line_index|
         match_data = line.match(BRANCH_LINE_REGEXP)
-        raise Git::UnexpectedResultError, 'Unexpected branch line format' unless match_data
+
+        raise Git::UnexpectedResultError, unexpected_branch_line_error(lines, line, line_index) unless match_data
         next nil if match_data[:not_a_branch] || match_data[:detached_ref]
+
         [
           match_data[:refname],
           !match_data[:current].nil?,
@@ -654,6 +657,18 @@ module Git
       end.compact
     end
 
+    def unexpected_branch_line_error(lines, line, index)
+      <<~ERROR
+        Unexpected line in output from `git branch -a`, line #{index + 1}
+
+        Full output:
+          #{lines.join("\n  ")}
+
+        Line #{index + 1}:
+          "#{line}"
+      ERROR
+    end
+
     def worktrees_all
       arr = []
       directory = ''

data/lib/git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -243,8 +243,8 @@ licenses:
 metadata:
   homepage_uri: http://github.com/ruby-git/ruby-git
   source_code_uri: http://github.com/ruby-git/ruby-git
-  changelog_uri: https://rubydoc.info/gems/git/2.3.1/file/CHANGELOG.md
-  documentation_uri: https://rubydoc.info/gems/git/2.3.1
+  changelog_uri: https://rubydoc.info/gems/git/2.3.2/file/CHANGELOG.md
+  documentation_uri: https://rubydoc.info/gems/git/2.3.2
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -261,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 2.28.0 or greater
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories