From b1837abbc2d55f536c31a2f763d872f4b2447c7b Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Fri, 22 Jun 2012 11:24:13 -0600 Subject: [PATCH] Fix nil error in search. --- lib/gollum/wiki.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/gollum/wiki.rb b/lib/gollum/wiki.rb index 64e0f763..fc0be314 100644 --- a/lib/gollum/wiki.rb +++ b/lib/gollum/wiki.rb @@ -481,14 +481,16 @@ module Gollum @repo.git.grep(*args).split("\n").each do |line| result = line.split(':') - file_name = result[1].gsub( ::File.extname(result[1]), '' ) + result_1 = result[1] + file_name = result_1.gsub( ::File.extname(result_1), '' ) results[file_name] = result[2].to_i end # Use git ls-files '*query*' to search for file names. Grep only searches file content. @repo.git.ls_files({}, "*#{ query }*").split("\n").each do |line| file_name = line.gsub( ::File.extname(line), '' ) - results[file_name] += 1; + count = results[file_name] + results[file_name] = count == nil ? 1 : count + 1; end results.map do |key,val|