diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-08-08 06:22:49 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2017-08-08 06:22:49 +0000 |
| commit | 5192f0a755672d12d9a257fada7d8d7bd056e60f (patch) | |
| tree | c37c36e2c74e0f116210ff72e73077367bad93d1 /lib/redmine | |
| parent | f3e420c80293fc98aeebc8b9c86ae1385903c616 (diff) | |
| download | redmine-5192f0a755672d12d9a257fada7d8d7bd056e60f.tar.gz redmine-5192f0a755672d12d9a257fada7d8d7bd056e60f.zip | |
Merged r16948 from trunk to 3.4-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.4-stable@16949 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine')
| -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 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 |