diff options
| author | Francisco Javier López <fjlopez@gitlab.com> | 2018-06-06 21:07:31 +0200 |
|---|---|---|
| committer | Francisco Javier López <fjlopez@gitlab.com> | 2018-06-06 21:55:32 +0200 |
| commit | 86d39016a26f73e82437d38fcf723677b97c1c8d (patch) | |
| tree | db822bc8c4c45b58b639be5862ac113ac432ad52 /lib | |
| parent | fddcfae6d8cc3790fe100584f8d7c09e014b01e1 (diff) | |
| download | gitlab-ce-86d39016a26f73e82437d38fcf723677b97c1c8d.tar.gz | |
Moving rev-list lfs options to Lfschanges
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/lfs_changes.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab/git/rev_list.rb | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/git/lfs_changes.rb b/lib/gitlab/git/lfs_changes.rb index b9e5cf258f4..320b2ad007b 100644 --- a/lib/gitlab/git/lfs_changes.rb +++ b/lib/gitlab/git/lfs_changes.rb @@ -39,7 +39,9 @@ module Gitlab end 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) end end diff --git a/lib/gitlab/git/rev_list.rb b/lib/gitlab/git/rev_list.rb index 79544ccf13d..33b641a090b 100644 --- a/lib/gitlab/git/rev_list.rb +++ b/lib/gitlab/git/rev_list.rb @@ -37,9 +37,9 @@ module Gitlab get_objects(opts, &lazy_block) end - def all_objects(require_path: nil, &lazy_block) + def all_objects(options: [], require_path: nil, &lazy_block) get_objects(including: :all, - options: ["--filter=blob:limit=#{Gitlab::Git::Blob::LFS_POINTER_MAX_SIZE}"], + options: options, require_path: require_path, &lazy_block) end |