Commit 54345979 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'fj-move-rev-list-option' into 'master'

Moving rev-list lfs options to LfsChanges

See merge request gitlab-org/gitlab-ce!19497
parents 5ebc4618 86d39016
...@@ -39,7 +39,9 @@ module Gitlab ...@@ -39,7 +39,9 @@ module Gitlab
end end
def git_all_pointers def git_all_pointers
rev_list.all_objects(require_path: true) do |object_ids| params = { options: ["--filter=blob:limit=#{Gitlab::Git::Blob::LFS_POINTER_MAX_SIZE}"], require_path: true }
rev_list.all_objects(params) do |object_ids|
Gitlab::Git::Blob.batch_lfs_pointers(@repository, object_ids) Gitlab::Git::Blob.batch_lfs_pointers(@repository, object_ids)
end end
end end
......
...@@ -37,9 +37,9 @@ module Gitlab ...@@ -37,9 +37,9 @@ module Gitlab
get_objects(opts, &lazy_block) get_objects(opts, &lazy_block)
end end
def all_objects(require_path: nil, &lazy_block) def all_objects(options: [], require_path: nil, &lazy_block)
get_objects(including: :all, get_objects(including: :all,
options: ["--filter=blob:limit=#{Gitlab::Git::Blob::LFS_POINTER_MAX_SIZE}"], options: options,
require_path: require_path, require_path: require_path,
&lazy_block) &lazy_block)
end end
......
...@@ -88,7 +88,7 @@ describe Gitlab::Git::RevList do ...@@ -88,7 +88,7 @@ describe Gitlab::Git::RevList do
context '#all_objects' do context '#all_objects' do
it 'fetches list of all pushed objects using rev-list' do it 'fetches list of all pushed objects using rev-list' do
stub_popen_rev_list('--all', '--objects', '--filter=blob:limit=200', output: "sha1\nsha2") stub_popen_rev_list('--all', '--objects', output: "sha1\nsha2")
expect { |b| rev_list.all_objects(&b) }.to yield_with_args(%w[sha1 sha2]) expect { |b| rev_list.all_objects(&b) }.to yield_with_args(%w[sha1 sha2])
end end
......
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