From: Toshi MARUYAMA Date: Fri, 24 Mar 2017 16:15:46 +0000 (+0000) Subject: Merged r16428 from trunk to 3.3-stable (#25371) X-Git-Tag: 3.3.3~19 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d373a95c04da691823d9212a9c9412bd2614e0e9;p=redmine.git Merged r16428 from trunk to 3.3-stable (#25371) git: use '--no-renames' option in 'show' command. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16429 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 574fc30a0..1dd317d72 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -314,10 +314,10 @@ module Redmine cmd_args = [] if identifier_to cmd_args << "diff" << "--no-color" << identifier_to << identifier_from - cmd_args << '--no-renames' if self.class.client_version_above?([2, 9]) else cmd_args << "show" << "--no-color" << identifier_from end + cmd_args << '--no-renames' if self.class.client_version_above?([2, 9]) cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) unless path.empty? diff = [] git_cmd(cmd_args) do |io|