From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 8 Mar 2011 11:13:18 +0000 (+0000)
Subject: scm: git: fix latin-1 directory entries() in adapter (#5251).
X-Git-Tag: 1.2.0~781
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=de71851e988ff2e5128d530a4cf4aa75b9cc95b3;p=redmine.git

scm: git: fix latin-1 directory entries() in adapter (#5251).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5061 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 46bf44d8e..19e32f6dc 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -119,7 +119,7 @@ module Redmine
                 sha  = $2
                 size = $3
                 name = $4
-                full_path = path.empty? ? name : "#{path}/#{name}"
+                full_path = p.empty? ? name : "#{p}/#{name}"
                 n      = scm_iconv('UTF-8', @path_encoding, name)
                 full_p = scm_iconv('UTF-8', @path_encoding, full_path)
                 entries << Entry.new({:name => n,