From 8fd11e8fdb646dd2ebd179999108f8fb7cc3ef8e Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Thu, 21 Jun 2012 19:18:46 -0600 Subject: [PATCH] Fix #396. Use ls-files to search file names (which define the page title). --- lib/gollum/wiki.rb | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index eeb633bb..f39b541b 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -468,7 +468,7 @@ module Gollum args = [{}, '-i', '-c', query, @ref, '--'] args << '--' << @page_file_dir if @page_file_dir - @repo.git.grep(*args).split("\n").map! do |line| + results = @repo.git.grep(*args).split("\n").map! do |line| result = line.split(':') file_name = result[1].gsub( ::File.extname(result[1]), '' ) @@ -477,6 +477,16 @@ module Gollum :name => file_name } end + + # Use git ls-files '*query*' to search for file names. Grep only searches file content. + results += @repo.git.ls_files({}, "*#{ query }*").split("\n").map! do |line| + { + :count => 1, + :name => line + } + end + + results end # Public: All of the versions that have touched the Page.