From d48d0b6cf193318e8fe69f56b852fe543021db1a Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Tue, 8 Aug 2017 06:24:05 +0000 Subject: [PATCH] Merged r16948 from trunk to 3.3-stable (#26645) git: remove "--no-color" option from "git --version" for git 2.14 compatibility. git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@16950 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/git_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 1dd317d72..3df6a9062 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