diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-03-08 11:13:18 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-03-08 11:13:18 +0000 |
| commit | de71851e988ff2e5128d530a4cf4aa75b9cc95b3 (patch) | |
| tree | 2d11ab7a0cb1247f64e621a99cb87932973af47f /lib/redmine/scm/adapters/git_adapter.rb | |
| parent | 266e33b5f1c1879ae4cb6db7c9eba17149c80532 (diff) | |
| download | redmine-de71851e988ff2e5128d530a4cf4aa75b9cc95b3.tar.gz redmine-de71851e988ff2e5128d530a4cf4aa75b9cc95b3.zip | |
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
Diffstat (limited to 'lib/redmine/scm/adapters/git_adapter.rb')
| -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 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, |