git 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d000b5ac2ceebebeb6c84eae6aa1c6f4b3d58dd444f15c70390baadf7bb3c8e
-  data.tar.gz: f45ef489fb3aa2d3cff1a45cb127bb27fe380693af5e322220322fd8aa6dfd33
+  metadata.gz: 29b8c6b76f613f41bcddf2786fe9b164ef2168f265f3b8fdccb9f8f4ead52669
+  data.tar.gz: b0f66b11fd1a2eba3640bfa42ff842dcfbd52ab30455026b97ebecad8fd86f0c
 SHA512:
-  metadata.gz: 6128142518501bce8bd4e5f40e178ac063359916daf544005bdc6187160619b74c6236a7f56b29438f3b5ebb547a5759b59b3140ee260ebd179bc8a4124d1a15
-  data.tar.gz: 56e9d4940992d8feab68502815563d6d16967c1d659748271bdd27e0e1a382f81ce4be4dd7682645b562f8b616be791f79437fdaaa072778aca724c91e40b4d1
+  metadata.gz: bb85d50e45a905b7e71617da29f6194e478b17aed237237e0dd53066a5182c328d4e992494a3b7d26df47223c0e601733400e62d04b7e9fffdf8993c22cd2fb5
+  data.tar.gz: ee9d9edbd87615caee4cc073acd2df9a047b46d5ba117997f193a98d28374d214e2994018d3bed10c0e4acad7cd913ba39da25ecc2b0fd973863930f19d0f129

data/CHANGELOG.md

@@ -5,6 +5,15 @@
 
 # Change Log
 
+## v1.13.2 (2023-02-02)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.13.1..v1.13.2)
+
+Changes since v1.13.1:
+
+* b6e031d Fix `Git::Lib#commit_data` for GPG-signed commits (#610)
+* b12b820 Fix escaped path decoding (#612)
+
 ## v1.13.1 (2023-01-12)
 
 [Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.13.0...v1.13.1)

data/lib/git/escaped_path.rb

@@ -42,7 +42,7 @@ module Git
     private
 
     def extract_octal(path, index)
-      [path[index + 1..index + 4].to_i(8), 4]
+      [path[index + 1..index + 3].to_i(8), 4]
     end
 
     def extract_escape(path, index)

data/lib/git/lib.rb

@@ -221,54 +221,57 @@ module Git
     def commit_data(sha)
       sha = sha.to_s
       cdata = command_lines('cat-file', 'commit', sha)
-      process_commit_data(cdata, sha, 0)
+      process_commit_data(cdata, sha)
     end
 
-    def process_commit_data(data, sha = nil, indent = 4)
+    def process_commit_data(data, sha)
       hsh = {
-        'sha'     => sha,
-        'message' => '',
-        'parent'  => []
+        'sha'    => sha,
+        'parent' => []
       }
 
-      loop do
-        key, *value = data.shift.split
-
-        break if key.nil?
-
+      each_cat_file_header(data) do |key, value|
         if key == 'parent'
-          hsh['parent'] << value.join(' ')
+          hsh['parent'] << value
         else
-          hsh[key] = value.join(' ')
+          hsh[key] = value
         end
       end
 
-      hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
+      hsh['message'] = data.join("\n") + "\n"
 
       return hsh
     end
 
+    CAT_FILE_HEADER_LINE = /\A(?<key>\w+) (?<value>.*)\z/
+
+    def each_cat_file_header(data)
+      while (match = CAT_FILE_HEADER_LINE.match(data.shift))
+        key = match[:key]
+        value_lines = [match[:value]]
+
+        while data.first.start_with?(' ')
+          value_lines << data.shift.lstrip
+        end
+
+        yield key, value_lines.join("\n")
+      end
+    end
+
     def tag_data(name)
       sha = sha.to_s
       tdata = command_lines('cat-file', 'tag', name)
-      process_tag_data(tdata, name, 0)
+      process_tag_data(tdata, name)
     end
 
-    def process_tag_data(data, name, indent=4)
-      hsh = {
-        'name'    => name,
-        'message' => ''
-      }
-
-      loop do
-        key, *value = data.shift.split
-
-        break if key.nil?
+    def process_tag_data(data, name)
+      hsh = { 'name' => name }
 
-        hsh[key] = value.join(' ')
+      each_cat_file_header(data) do |key, value|
+        hsh[key] = value
       end
 
-      hsh['message'] = data.collect {|line| line[indent..-1]}.join("\n") + "\n"
+      hsh['message'] = data.join("\n") + "\n"
 
       return hsh
     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.1'
+  VERSION='1.13.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2023-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - git 1.6.0.0, or greater
-rubygems_version: 3.3.26
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: An API to create, read, and manipulate Git repositories