gitlab-grit 2.5.1 → 2.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f453ada29206a7deeb55fe63bba1105a9ee67fe5
-  data.tar.gz: d593185fb02934345a4835b3c5c2088aefb6d5fd
+  metadata.gz: e01843f1f907d4f805ebe1a462b2b9ef8d9eaab5
+  data.tar.gz: b9f43ffa1683eaf547231ed43669af157f8164c4
 SHA512:
-  metadata.gz: 056b694f2fc7938a97c142461d3b29a493c0aba78344bf15808bf42b9cc42af0c2c437bb5852b9b22db65d057ff8abfb4b73c0caac14354efc0f1cf244c64031
-  data.tar.gz: d56d89a626aee898ffca47a4e08aa8fd85c75fe14f3bf9d0beff6ffe611b78a7e2ffaa56f63853224ef20b6bd4bb9ccb29a0b3e0f28694ca14be1e9932beaeeb
+  metadata.gz: b24104f75bfe51628548effd17d98df9f5a0afd5b21b78e46014dfdfaec6429e6af233b8e6eb23c0d94854886a4129cb06b046c1b0995e59575a0ba950e4f8a9
+  data.tar.gz: f2d909494083105615098ff61a57da78b7ff4a041b214286fb5c3d5b0c5a0cb1717d8b71e9fddb7d8909fe7bd70e9a1115fdb71d1e46bb94cbc696eb31247941

data/lib/grit/git.rb

@@ -319,10 +319,13 @@ module Grit
       env = options.delete(:env) || {}
       raise_errors = options.delete(:raise)
       process_info = options.delete(:process_info)
+      pipeline = options.delete(:pipeline)
 
       # fall back to using a shell when the last argument looks like it wants to
       # start a pipeline for compatibility with previous versions of grit.
-      return run(prefix, cmd, '', options, args) if args[-1].to_s[0] == ?|
+      if args[-1].to_s[0] == ?| && pipeline
+        return run(prefix, cmd, '', options, args)
+      end
 
       # more options
       input    = options.delete(:input)
@@ -418,7 +421,10 @@ module Grit
     end
 
     # DEPRECATED OPEN3-BASED COMMAND EXECUTION
-
+    # Used only for pipeline support.
+    # Ex.
+    #   git log | grep bugfix
+    #
     def run(prefix, cmd, postfix, options, args, &block)
       timeout  = options.delete(:timeout) rescue nil
       timeout  = true if timeout.nil?

data/lib/grit/repo.rb

@@ -1,5 +1,4 @@
 module Grit
-
   class Repo
     DAEMON_EXPORT_FILE = 'git-daemon-export-ok'
     BATCH_PARSERS      = {
@@ -621,6 +620,7 @@ module Grit
     def archive_tar_gz(treeish = 'master', prefix = nil)
       options = {}
       options[:prefix] = prefix if prefix
+      options[:pipeline] = true
       self.git.archive(options, treeish, "| gzip -n")
     end
 
@@ -636,6 +636,7 @@ module Grit
       options = {}
       options[:prefix] = prefix if prefix
       options[:format] = format if format
+      options[:pipeline] = true
       self.git.archive(options, treeish, "| #{pipe} > #{filename}")
     end
 
@@ -715,7 +716,7 @@ module Grit
 
     def grep(searchtext, contextlines = 3, branch = 'master')
       context_arg = '-C ' + contextlines.to_s
-      result = git.native(:grep, {}, '-n', '-E', '-i', '-z', '--heading', '--break', context_arg, searchtext, branch).force_encoding('UTF-8')
+      result = git.native(:grep, {pipeline: false}, '-n', '-E', '-i', '-z', '--heading', '--break', context_arg, searchtext, branch).force_encoding('UTF-8')
       greps = []
       filematches = result.split("\n\n")
       filematches.each do |filematch|
@@ -756,5 +757,4 @@ module Grit
       %Q{#<Grit::Repo "#{@path}">}
     end
   end # Repo
-
 end # Grit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab-grit
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.5.2
 platform: ruby
 authors:
 - Tom Preston-Werner