kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

scm: git: support path encoding in adapter cat (#5251). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5042 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-03-08 05:17:43 +00:00
parent c809c0c498
commit 7e6a5ec7ab
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/redmine/scm/adapters/git_adapter.rb
View File

@ -309,14 +309,16 @@ module Redmine
if identifier.nil? if identifier.nil?
identifier = 'HEAD' identifier = 'HEAD'
end end
cmd = "#{self.class.sq_bin} --git-dir #{target('')} show --no-color #{shell_quote(identifier + ':' + path)}" cmd_args = %w|show --no-color|
cmd_args << "#{identifier}:#{scm_iconv(@path_encoding, 'UTF-8', path)}"
cat = nil cat = nil
shellout(cmd) do |io| scm_cmd(*cmd_args) do |io|
io.binmode io.binmode
cat = io.read cat = io.read
end end
return nil if $? && $?.exitstatus != 0
cat cat
rescue ScmCommandAborted
nil
end end
class Revision < Redmine::Scm::Adapters::Revision class Revision < Redmine::Scm::Adapters::Revision