diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-08-08 06:24:05 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-08-08 06:24:05 +0000 |
| commit | d48d0b6cf193318e8fe69f56b852fe543021db1a (patch) | |
| tree | d4423ab03bf6cc322fd09c49b438dc6ad64fdba8 | |
| parent | 988402f8c8d8ecbade918e83c24bf4527560e232 (diff) | |
| download | redmine-d48d0b6cf193318e8fe69f56b852fe543021db1a.tar.gz redmine-d48d0b6cf193318e8fe69f56b852fe543021db1a.zip | |
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
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 2 |
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 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 |