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 574fc30a08980a20e3e1ecb43969941120947c5a..1dd317d72e03771a0280d65ee8ad72a39d9a58cf 100644 (file)
--- 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|