Fix nil error in search.

2012-06-22 11:24:13 -06:00
parent 611e1a536c
commit b1837abbc2
1 changed files with 4 additions and 2 deletions
@@ -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|