summaryrefslogtreecommitdiffstats
path: root/lib/redmine
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-11-23 14:27:09 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2019-11-23 14:27:09 +0000
commit68b4701a65d98c16d9f617679f2d3e1bdb37ce99 (patch)
tree5dc99d8352a04461d09a97b1be9dee6686d1fed0 /lib/redmine
parentdf7188a2e5f04fa241577d91ab986fb927b6155b (diff)
downloadredmine-68b4701a65d98c16d9f617679f2d3e1bdb37ce99.tar.gz
redmine-68b4701a65d98c16d9f617679f2d3e1bdb37ce99.zip
cleanup: rubocop: fix Style/MultilineIfModifier and Style/MultilineTernaryOperator in lib/redmine/scm/adapters/git_adapter.rb
git-svn-id: http://svn.redmine.org/redmine/trunk@19199 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb25
1 files changed, 18 insertions, 7 deletions
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