Merge 0ae9d4c into 28ba79c

gitlabhq · May 17, 2013 · 0600a03 · 0600a03
2 parents 28ba79c + 0ae9d4c
commit 0600a03
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/grit/repo.rb b/lib/grit/repo.rb
@@ -715,7 +715,7 @@ def rename(name)
 
     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, {}, '-n', '-E', '-i', '-z', '--heading', '--break', context_arg, searchtext, branch).encode('UTF-8', invalid: :replace, undef: :replace, replace: '')
       greps = []
       filematches = result.split("\n\n")
       filematches.each do |filematch|