From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Mon, 20 Mar 2017 18:03:42 +0000 (+0000)
Subject: Merged r16422 from trunk to 3.3-stable (#25371)
X-Git-Tag: 3.3.3~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=dbc64d0b8e2234a63cf35b16e78b6f38d82cfaeb;p=redmine.git

Merged r16422 from trunk to 3.3-stable (#25371)

Git 2.9 compatibility.

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16424 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 52ecf691f..574fc30a0 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -166,6 +166,7 @@ module Redmine
         def lastrev(path, rev)
           return nil if path.nil?
           cmd_args = %w|log --no-color --encoding=UTF-8 --date=iso --pretty=fuller --no-merges -n 1|
+          cmd_args << '--no-renames' if self.class.client_version_above?([2, 9])
           cmd_args << rev if rev
           cmd_args << "--" << path unless path.empty?
           lines = []
@@ -194,6 +195,7 @@ module Redmine
         def revisions(path, identifier_from, identifier_to, options={})
           revs = Revisions.new
           cmd_args = %w|log --no-color --encoding=UTF-8 --raw --date=iso --pretty=fuller --parents --stdin|
+          cmd_args << '--no-renames' if self.class.client_version_above?([2, 9])
           cmd_args << "--reverse" if options[:reverse]
           cmd_args << "-n" << "#{options[:limit].to_i}" if options[:limit]
           cmd_args << "--" << scm_iconv(@path_encoding, 'UTF-8', path) if path && !path.empty?
@@ -312,6 +314,7 @@ 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