git 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '03386fbc4d48647754608adba467800440ec80e5e8aecddac930a3e2565827bd'
-  data.tar.gz: 180866b01d05c40d495638ee8ddf2a1d8ca2e534250575c09c20728a2473855e
+  metadata.gz: df0d52946aa19627fbff62a47b86f694763e957e1f6d87b9a5e14e6cae46ff1d
+  data.tar.gz: f2b9e31a9cfb944da55c25b22b54aacd54d788e77ef2808d7cfba0a466cedb8a
 SHA512:
-  metadata.gz: b5115fff1ce7fbbc3a0fb8d22b8f27b6c3acb00e27613e3e8d0a4d760c2b40a0355a3c2e57e3e8d14e91545f985eea51caca44eab4b04b112f00393e64f48216
-  data.tar.gz: 4494ee6206a07e17b2c1bb983c7519689364c1ec15bfa811a3ab4cf380aba9a29c783adfff82917c0379a7911b2a5a51d0661bf928f69d9502a271d8d11a846e
+  metadata.gz: 0a812bbdc6aabf7c63d30f96659edfe4a65a141dce613046d3f7e537f5105a80e48f6ae03cb30c4d806243cfd130b49bbc852f43df493191e26dfec2f03551f2
+  data.tar.gz: b0a634418e93055e3f3c2c5256176515aa990950f4927e2b0ee82055a87543f0695cf13ae4a1f5bd99ab1cec9f8e264153b8aa2ec3f4392c88c5890c17ce7c13

data/CHANGELOG.md

@@ -5,6 +5,16 @@
 
 # Change Log
 
+## v1.13.0 (2022-12-10)
+
+[Full Changelog](https://github.com/ruby-git/ruby-git/compare/v1.12.0...v1.13.0)
+
+* 8349224 Update list of maintainers (#598)
+* 4fe8738 In ls-files do not unescape file paths with eval (#602)
+* 74b8e11 Add start_point option for checkout command (#597)
+* ff6dcf4 Do not assume the default branch is 'master' in tests
+* 8279298 Fix exception when Git is autoloaded (#594)
+
 ## v1.12.0
 
 See https://github.com/ruby-git/ruby-git/releases/tag/v1.12.0
@@ -151,4 +161,3 @@ See https://github.com/ruby-git/ruby-git/releases/tag/v1.4.0
 ## 1.0.1
 
 * Initial version
-

data/MAINTAINERS.md

@@ -7,7 +7,6 @@
 
 When making changes in this repository, one of the maintainers below must review and approve your pull request.
 
-### Maintainers
-
+* [James Couball](https://github.com/jcouball)
+* [Frank Throckmorton](https://github.com/frankthrock)
 * [Per Lundberg](https://github.com/perlun)
-* [James Couball](https://github.com/jcouball)

data/README.md

@@ -265,6 +265,7 @@ g.branch('existing_branch').checkout
 g.branch('master').contains?('existing_branch')
 
 g.checkout('new_branch')
+g.checkout('new_branch', new_branch: true, start_point: 'master')
 g.checkout(g.branch('new_branch'))
 
 g.branch(name).merge(branch2)

data/lib/git/lib.rb

@@ -63,6 +63,8 @@ module Git
         @git_work_dir = base[:working_directory]
       end
       @logger = logger
+
+      Git::Lib.warn_if_old_command(self)
     end
 
     # creates or reinitializes the repository
@@ -486,7 +488,9 @@ module Git
       command_lines('ls-files', '--stage', location).each do |line|
         (info, file) = line.split("\t")
         (mode, sha, stage) = info.split
-        file = eval(file) if file =~ /^\".*\"$/ # This takes care of quoted strings returned from git
+        if file.start_with?('"') && file.end_with?('"')
+          file = Git::EscapedPath.new(file[1..-2]).unescape
+        end
         hsh[file] = {:path => file, :mode_index => mode, :sha_index => sha, :stage => stage}
       end
       hsh
@@ -762,11 +766,21 @@ module Git
       command('branch', '-D', branch)
     end
 
+    # Runs checkout command to checkout or create branch
+    #
+    # accepts options:
+    #  :new_branch
+    #  :force
+    #  :start_point
+    #
+    # @param [String] branch
+    # @param [Hash] opts
     def checkout(branch, opts = {})
       arr_opts = []
       arr_opts << '-b' if opts[:new_branch] || opts[:b]
       arr_opts << '--force' if opts[:force] || opts[:f]
       arr_opts << branch
+      arr_opts << opts[:start_point] if opts[:start_point] && arr_opts.include?('-b')
 
       command('checkout', arr_opts)
     end
@@ -1027,6 +1041,13 @@ module Git
       (self.current_command_version <=>  self.required_command_version) >= 0
     end
 
+    def self.warn_if_old_command(lib)
+      return true if @version_checked
+      unless lib.meets_required_version?
+        $stderr.puts "[WARNING] The git gem requires git #{lib.required_command_version.join('.')} or later, but only found #{lib.current_command_version.join('.')}. You should probably upgrade."
+      end
+      @version_checked = true
+    end
 
     private
 

data/lib/git/version.rb

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

data/lib/git.rb

@@ -27,11 +27,6 @@ require 'git/working_directory'
 require 'git/worktree'
 require 'git/worktrees'
 
-lib = Git::Lib.new(nil, nil)
-unless lib.meets_required_version?
-  $stderr.puts "[WARNING] The git gem requires git #{lib.required_command_version.join('.')} or later, but only found #{lib.current_command_version.join('.')}. You should probably upgrade."
-end
-
 # The Git module provides the basic functions to open a git
 # reference to work with. You can open a working directory,
 # open a bare repository, initialize a new repo or clone an

metadata

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