diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2017-02-02 17:41:23 +0300 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2017-03-28 15:19:52 +0300 |
| commit | 91e150266adeeaa60c8626a3dd1ddc467347744f (patch) | |
| tree | 56b442adb455bc4e900664d04c7d98ca8aa736c7 /lib | |
| parent | e396b43771da1e8d47bf5ce6832adb541ed55b34 (diff) | |
Use Rugged::SORT_NONE instead of Rugged::SORT_DATE
Meaning of SORT_DATE was changed in libgit2.
See https://github.com/libgit2/libgit2/commit/82d4c0e6b841ae0e466bd97ab1faec0920a6b7a2
SORT_NONE is the order produced by "git log".
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/git/repository.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb index 7be2fc7f6f7..057f7748c3e 100644 --- a/lib/gitlab/git/repository.rb +++ b/lib/gitlab/git/repository.rb @@ -320,7 +320,7 @@ module Gitlab def log_by_walk(sha, options) walk_options = { show: sha, - sort: Rugged::SORT_DATE, + sort: Rugged::SORT_NONE, limit: options[:limit], offset: options[:offset] } @@ -382,7 +382,7 @@ module Gitlab # a detailed list of valid arguments. def commits_between(from, to) walker = Rugged::Walker.new(rugged) - walker.sorting(Rugged::SORT_DATE | Rugged::SORT_REVERSE) + walker.sorting(Rugged::SORT_NONE | Rugged::SORT_REVERSE) sha_from = sha_from_ref(from) sha_to = sha_from_ref(to) @@ -460,7 +460,7 @@ module Gitlab if actual_options[:order] == :topo walker.sorting(Rugged::SORT_TOPO) else - walker.sorting(Rugged::SORT_DATE) + walker.sorting(Rugged::SORT_NONE) end commits = [] |