Commit 77659b25 authored by Stan Hu's avatar Stan Hu
Browse files

Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'

Prevent RevList failing on non utf8 paths

Closes #41627

See merge request gitlab-org/gitlab-ce!16440
---
title: Prevent RevList failing on non utf8 paths
merge_request: 16440
author:
type: fixed
......@@ -95,7 +95,7 @@ def objects_from_output(object_output, require_path: nil)
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 @@ def stub_lazy_popen_rev_list(*additional_args, output:)
]
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 @@ def stub_lazy_popen_rev_list(*additional_args, output:)
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")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment