diff options
| -rw-r--r-- | .rubocop_todo.yml | 2 | ||||
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 25 |
2 files changed, 18 insertions, 9 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 1252e78fb..7f5f124aa 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1258,7 +1258,6 @@ Style/MultilineIfModifier: - 'app/views/common/feed.atom.builder' - 'lib/redmine/access_keys.rb' - 'lib/redmine/helpers/gantt.rb' - - 'lib/redmine/scm/adapters/git_adapter.rb' - 'lib/redmine/wiki_formatting.rb' - 'lib/redmine/wiki_formatting/textile/redcloth3.rb' - 'test/mocks/open_id_authentication_mock.rb' @@ -1270,7 +1269,6 @@ Style/MultilineTernaryOperator: - 'app/models/issue_query.rb' - 'lib/redmine/ciphering.rb' - 'lib/redmine/scm/adapters/filesystem_adapter.rb' - - 'lib/redmine/scm/adapters/git_adapter.rb' Style/MultipleComparison: Exclude: diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index d06639726..e469465ab 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -149,13 +149,24 @@ module Redmine full_path = p.empty? ? name : "#{p}/#{name}" n = scm_iconv('UTF-8', @path_encoding, name) full_p = scm_iconv('UTF-8', @path_encoding, full_path) - entries << Entry.new({:name => n, - :path => full_p, - :kind => (type == "tree") ? 'dir' : 'file', - :size => (type == "tree") ? nil : size, - :lastrev => options[:report_last_commit] ? - lastrev(full_path, identifier) : Revision.new - }) unless entries.detect{|entry| entry.name == name} + unless entries.detect{|entry| entry.name == name} + entries << + Entry. + new( + { + :name => n, + :path => full_p, + :kind => (type == "tree") ? 'dir' : 'file', + :size => (type == "tree") ? nil : size, + :lastrev => + if options[:report_last_commit] + lastrev(full_path, identifier) + else + Revision.new + end + } + ) + end end end end |