git 1.10.2 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96afd3adb091a3428a45ad172cfc980f64af32d5a809fc0f26e45a275811e04f
-  data.tar.gz: be9cc2d9f88513c178f064f2374d7c28ba47eeffa5d93486edacf39df5d26b63
+  metadata.gz: 564087b850fc095e75b62f5fd231d27e7dc145b7839c795d8c84355cb0df0c67
+  data.tar.gz: 0d377c66918e25e2a52f1155db445657452be662553756c3e08cb5d66db29d2d
 SHA512:
-  metadata.gz: 21fb082ab5d96163049b27983f2a923573166088876300f85a34e8b5476559b5ec12d9c4a84a4afaff9ec0afdd2054f75099fda98b9913305a2dac18a2f6a776
-  data.tar.gz: 0ee7d7a9ac8665b3ac94fd6471de876f0e9cade17e3e58b4918c6de397d7c4a1d4c35b5695d0040cbbc0b739a9318550f4e08e5b16c51c7f9d3d6f6c7ef587a6
+  metadata.gz: 0e6bc7af5d099a33e79afabc655d62faa5e7ce7bcface1843f35a50fbafe2d02a26065b56d5cf2ec26fd7602363a232543ae8a5584952004d8253771a2753fdc
+  data.tar.gz: 732a2e8bbb690279caccc65dcedce95cb378d3554886574fbd71985b09dd77f74d3c82e5f0a71d5af19bddf943dd41b6b5a86be2e847205a26ff1db0ecaa2f1a

data/CHANGELOG.md

@@ -5,6 +5,17 @@
 
 # Change Log
 
+## v1.11.0
+
+* 292087e Supress unneeded test output (#570)
+* 19dfe5e Add support for fetch options "--force/-f" and "--prune-tags/-P". (#563)
+* 018d919 Fix bug when grepping lines that contain numbers surrounded by colons (#566)
+* c04d16e remove from maintainer (#567)
+* 291ca09 Address command line injection in Git::Lib#fetch
+* 521b8e7 Release v1.10.2 (#561)
+
+See https://github.com/ruby-git/ruby-git/releases/tag/v1.11.0
+
 ## v1.10.2
 
 See https://github.com/ruby-git/ruby-git/releases/tag/v1.10.2

data/MAINTAINERS.md

@@ -10,5 +10,4 @@ When making changes in this repository, one of the maintainers below must review
 ### Maintainers
 
 * [Per Lundberg](https://github.com/perlun)
-* [Vern Burton](https://github.com/tarcinil)
 * [James Couball](https://github.com/jcouball)

data/lib/git/lib.rb

@@ -419,7 +419,7 @@ module Git
 
       hsh = {}
       command_lines('grep', grep_opts).each do |line|
-        if m = /(.*)\:(\d+)\:(.*)/.match(line)
+        if m = /(.*?)\:(\d+)\:(.*)/.match(line)
           hsh[m[1]] ||= []
           hsh[m[1]] << [m[2].to_i, m[3]]
         end
@@ -875,14 +875,17 @@ module Git
       command('tag', arr_opts)
     end
 
-
     def fetch(remote, opts)
-      arr_opts = [remote]
-      arr_opts << opts[:ref] if opts[:ref]
+      arr_opts = []
       arr_opts << '--tags' if opts[:t] || opts[:tags]
       arr_opts << '--prune' if opts[:p] || opts[:prune]
+      arr_opts << '--prune-tags' if opts[:P] || opts[:'prune-tags']
+      arr_opts << '--force' if opts[:f] || opts[:force]
       arr_opts << '--unshallow' if opts[:unshallow]
       arr_opts << '--depth' << opts[:depth] if opts[:depth]
+      arr_opts << '--'
+      arr_opts << remote
+      arr_opts << opts[:ref] if opts[:ref]
 
       command('fetch', arr_opts)
     end

data/lib/git/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git
 version: !ruby/object:Gem::Version
-  version: 1.10.2
+  version: 1.11.0
 platform: ruby
 authors:
 - Scott Chacon and others
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rchardet