diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-11-27 15:48:30 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2010-11-27 15:48:30 +0000 |
| commit | b58382ef2e63232bc357171530a8654d4591dc60 (patch) | |
| tree | ec1fefcaf39ae288f93b481d83ace4016a67abc1 | |
| parent | 541a371b412afe3392f83fa364660c5528cd8a5c (diff) | |
| download | redmine-b58382ef2e63232bc357171530a8654d4591dc60.tar.gz redmine-b58382ef2e63232bc357171530a8654d4591dc60.zip | |
Merged r4386 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4440 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | lib/redmine/scm/adapters/git_adapter.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index 1db57c7d6..e801f22f7 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -211,7 +211,7 @@ module Redmine if identifier_to cmd = "#{GIT_BIN} --git-dir #{target('')} diff --no-color #{shell_quote identifier_to} #{shell_quote identifier_from}" else - cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}" + cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote identifier_from}" end cmd << " -- #{shell_quote path}" unless path.empty? @@ -255,7 +255,7 @@ module Redmine if identifier.nil? identifier = 'HEAD' end - cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote(identifier + ':' + path)}" + cmd = "#{GIT_BIN} --git-dir #{target('')} show --no-color #{shell_quote(identifier + ':' + path)}" cat = nil shellout(cmd) do |io| io.binmode |