summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-08-08 05:10:32 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2017-08-08 05:10:32 +0000
commit432cf42b4727d100e7aa0cde75584d4a8198aafa (patch)
tree05b92460f7848e180c2bd97b3049a503ce105ac0 /lib
parent10571f5e585329b3bf3d445e204c81b605e7796a (diff)
downloadredmine-432cf42b4727d100e7aa0cde75584d4a8198aafa.tar.gz
redmine-432cf42b4727d100e7aa0cde75584d4a8198aafa.zip
git: remove "--no-color" option from "git --version" for git 2.14 compatibility (#26645)
git-svn-id: http://svn.redmine.org/redmine/trunk@16948 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 6c615cb11..fcc77f393 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -54,7 +54,7 @@ module Redmine
end
def scm_version_from_command_line
- shellout("#{sq_bin} --version --no-color") { |io| io.read }.to_s
+ shellout("#{sq_bin} --version") { |io| io.read }.to_s
end
end