merge gfm

This commit is contained in:
risk
2011-07-21 15:04:50 -07:00
7 changed files with 37 additions and 18 deletions
+8 -5
View File
@@ -525,11 +525,14 @@ module Gollum
#
# Returns a flat Array of Gollum::Page instances.
def tree_list(ref)
sha = @access.ref_to_sha(ref)
commit = @access.commit(sha)
tree_map_for(sha).inject([]) do |list, entry|
next list unless @page_class.valid_page_name?(entry.name)
list << entry.page(self, commit)
if sha = @access.ref_to_sha(ref)
commit = @access.commit(sha)
tree_map_for(sha).inject([]) do |list, entry|
next list unless @page_class.valid_page_name?(entry.name)
list << entry.page(self, commit)
end
else
[]
end
end