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

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
09e76f29 · Toshi MARUYAMA · Eric Davis · 107f92ab · 09e76f29
Commit 09e76f29 authored Mar 08, 2011 by Toshi MARUYAMA Committed by Eric Davis Apr 16, 2011
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

git_adapter.rb lib/redmine/scm/adapters/git_adapter.rb +5 -3

No files found.
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -309,14 +309,16 @@ module Redmine
          if identifier.nil?
            identifier = 'HEAD'
          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
-          shellout(cmd) do |io|
+          scm_cmd(*cmd_args) do |io|
            io.binmode
            cat = io.read
          end
-          return nil if $? && $?.exitstatus != 0
          cat
+        rescue ScmCommandAborted
+          nil
        end

        class Revision < Redmine::Scm::Adapters::Revision