summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-03-24 15:53:04 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-03-24 15:53:04 +0000
commit14cfe2c67a5683c8cdbcaf73c043a8c23b6e68d8 (patch)
tree483d364c1f61b0683158f72c43373da1c8840f0b /lib
parent21f8ce885df7991b77ca3c4c22634456ba18474a (diff)
git: use '--no-renames' option in 'show' command (#25371)
git-svn-id: http://svn.redmine.org/redmine/trunk@16428 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb2
1 files changed, 1 insertions, 1 deletions
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|