Prevent RevList failing on non utf8 paths
This commit is contained in:
parent
a52d8c101d
commit
c4dd7b8296
3 changed files with 16 additions and 2 deletions
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Prevent RevList failing on non utf8 paths
|
||||
merge_request: 16440
|
||||
author:
|
||||
type: fixed
|
|
@ -95,7 +95,7 @@ module Gitlab
|
|||
object_output.map do |output_line|
|
||||
sha, path = output_line.split(' ', 2)
|
||||
|
||||
next if require_path && path.blank?
|
||||
next if require_path && path.to_s.empty?
|
||||
|
||||
sha
|
||||
end.reject(&:nil?)
|
||||
|
|
|
@ -39,7 +39,7 @@ describe Gitlab::Git::RevList do
|
|||
]
|
||||
|
||||
expect(rev_list).to receive(:popen).with(*params) do |*_, lazy_block:|
|
||||
lazy_block.call(output.split("\n").lazy)
|
||||
lazy_block.call(output.lines.lazy.map(&:chomp))
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -64,6 +64,15 @@ describe Gitlab::Git::RevList do
|
|||
expect(rev_list.new_objects(require_path: true)).to eq(%w[sha2])
|
||||
end
|
||||
|
||||
it 'can handle non utf-8 paths' do
|
||||
non_utf_char = [0x89].pack("c*").force_encoding("UTF-8")
|
||||
stub_lazy_popen_rev_list('newrev', '--not', '--all', '--objects', output: "sha2 πå†h/†ø/ƒîlé#{non_utf_char}\nsha1")
|
||||
|
||||
rev_list.new_objects(require_path: true) do |object_ids|
|
||||
expect(object_ids.force).to eq(%w[sha2])
|
||||
end
|
||||
end
|
||||
|
||||
it 'can yield a lazy enumerator' do
|
||||
stub_lazy_popen_rev_list('newrev', '--not', '--all', '--objects', output: "sha1\nsha2")
|
||||
|
||||
|
|
Loading…
Reference in a new issue