meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

cleanup: rubocop: fix Layout/ClosingParenthesisIndentation in lib/redmine/scm/adapters/git_adapter.rb

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@19137 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2019-11-21 12:46:07 +00:00
parent 9db5d29287
commit 01545e4ade
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/redmine/scm/adapters/git_adapter.rb
View File

@ -357,12 +357,15 @@ module Redmine
elsif line =~ /^author (.+)/ elsif line =~ /^author (.+)/
authors_by_commit[identifier] = $1.strip authors_by_commit[identifier] = $1.strip
elsif line =~ /^\t(.*)/ elsif line =~ /^\t(.*)/
blame.add_line($1, Revision.new( blame.add_line(
:identifier => identifier, $1,
:revision => identifier, Revision.new(
:scmid => identifier, :identifier => identifier,
:author => authors_by_commit[identifier] :revision => identifier,
)) :scmid => identifier,
:author => authors_by_commit[identifier]
)
)
identifier = '' identifier = ''
author = '' author = ''
end end
@ -404,11 +407,12 @@ module Redmine
full_args << '-c' << 'log.decorate=no' full_args << '-c' << 'log.decorate=no'
end end
full_args += args full_args += args
ret = shellout( ret =
self.class.sq_bin + ' ' + full_args.map { |e| shell_quote e.to_s }.join(' '), shellout(
options, self.class.sq_bin + ' ' + full_args.map { |e| shell_quote e.to_s }.join(' '),
&block options,
) &block
)
if $? && $?.exitstatus != 0 if $? && $?.exitstatus != 0
raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}" raise ScmCommandAborted, "git exited with non-zero status: #{$?.exitstatus}"
end end