diff options
author | Jacob Vosmaer <jacob@gitlab.com> | 2018-01-30 17:19:58 +0300 |
---|---|---|
committer | Jacob Vosmaer <jacob@gitlab.com> | 2018-01-30 17:19:58 +0300 |
commit | 0cf34d4d6d350ae6987da2260e0824bf91e752ed (patch) | |
tree | 79d2de7a46d0b4168fd0c55743c6f4395a30a173 /lib/gitlab/git/repository.rb | |
parent | e74e6fcb5eecb7841a412cb0d3e9627556d83eaf (diff) |
Remove Rugged::Walk implementation of #loggitaly-ruby-isolation-failure
Diffstat (limited to 'lib/gitlab/git/repository.rb')
-rw-r--r-- | lib/gitlab/git/repository.rb | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 3a7930154e5..7534b227609 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -462,7 +462,6 @@ module Gitlab path: nil, follow: false, skip_merges: false, - disable_walk: false, after: nil, before: nil } @@ -494,11 +493,7 @@ module Gitlab return [] end - if log_using_shell?(options) - log_by_shell(sha, options) - else - log_by_walk(sha, options) - end + log_by_shell(sha, options) end def count_commits(options) @@ -1607,24 +1602,6 @@ module Gitlab end end - def log_using_shell?(options) - options[:path].present? || - options[:disable_walk] || - options[:skip_merges] || - options[:after] || - options[:before] - end - - def log_by_walk(sha, options) - walk_options = { - show: sha, - sort: Rugged::SORT_NONE, - limit: options[:limit], - offset: options[:offset] - } - Rugged::Walker.walk(rugged, walk_options).to_a - end - # Gitaly note: JV: although #log_by_shell shells out to Git I think the # complexity is such that we should migrate it as Ruby before trying to # do it in Go. |