grep: multiple path_limiters and extended_regexp

blanham · blanham · commit 46e315c3218f · 2023-02-23T07:48:53.000-06:00
Signed-off-by: Bryce Lanham &lt;blanham@gmail.com&gt;
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
@@ -413,10 +413,12 @@ def grep(string, opts = {})
       grep_opts = ['-n']
       grep_opts << '-i' if opts[:ignore_case]
       grep_opts << '-v' if opts[:invert_match]
+      grep_opts << '-E' if opts[:extended_regexp]
       grep_opts << '-e'
       grep_opts << string
       grep_opts << opts[:object] if opts[:object].is_a?(String)
-      grep_opts << '--' << opts[:path_limiter] if opts[:path_limiter].is_a? String
+      grep_opts.push('--', opts[:path_limiter]) if opts[:path_limiter].is_a?(String)
+      grep_opts.push('--', *opts[:path_limiter]) if opts[:path_limiter].is_a?(Array)
 
       hsh = {}
       command_lines('grep', *grep_opts).each do |line|
diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb
@@ -291,6 +291,12 @@ def test_grep
     assert_equal("you can't search me!", match["gitsearch1:scott/newfile"].first[1])
     assert_equal(1, match.size)
 
+    match = @lib.grep('search', :object => 'gitsearch1', :path_limiter => ['scott/new*', 'scott/text.*'])
+    assert_equal("you can't search me!", match["gitsearch1:scott/newfile"].first[1])
+    assert_equal('to search one', match['gitsearch1:scott/text.txt'].assoc(6)[1])
+    assert_equal(2, match['gitsearch1:scott/text.txt'].size)
+    assert_equal(2, match.size)
+
     match = @lib.grep('SEARCH', :object => 'gitsearch1')
     assert_equal(0, match.size)
 
@@ -302,6 +308,11 @@ def test_grep
     assert_equal(6, match['gitsearch1:scott/text.txt'].size)
     assert_equal(2, match.size)
 
+    match = @lib.grep("you can't search me!|nothing!", :object => 'gitsearch1', :extended_regexp => true)
+    assert_equal("you can't search me!", match["gitsearch1:scott/newfile"].first[1])
+    assert_equal("nothing!", match["gitsearch1:scott/text.txt"].first[1])
+    assert_equal(2, match.size)
+
     match = @lib.grep('Grep', :object => 'grep_colon_numbers')
     assert_equal("Grep regex doesn't like this:4342: because it is bad", match['grep_colon_numbers:colon_numbers.txt'].first[1])
     assert_equal(1, match.size)
