Fix Gitaly::Commit#is_ancestor30586-fix-gitaly-is-ancestor

- Upgrade Gitaly-version

2 files changed, 22 insertions, 13 deletions

diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index 452dba7971d..18eda0279f7 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -451,7 +451,7 @@ module Gitlab
 
       # Returns true is +from+ is direct ancestor to +to+, otherwise false
       def is_ancestor?(from, to)
-        Gitlab::GitalyClient::Commit.is_ancestor(self, from, to)
+        gitaly_commit_client.is_ancestor(from, to)
       end
 
       # Return an array of Diff objects that represent the diff
@@ -1273,6 +1273,10 @@ module Gitlab
         @gitaly_ref_client ||= Gitlab::GitalyClient::Ref.new(self)
       end
 
+      def gitaly_commit_client
+        @gitaly_commit_client ||= Gitlab::GitalyClient::Commit.new(self)
+      end
+
       # Returns the `Rugged` sorting type constant for a given
       # sort type key. Valid keys are `:none`, `:topo`, and `:date`
       def rugged_sort_type(key)
diff --git a/lib/gitlab/gitaly_client/commit.rb b/lib/gitlab/gitaly_client/commit.rb
index b7f39f3ef0b..27db1e19bc1 100644
--- a/lib/gitlab/gitaly_client/commit.rb
+++ b/lib/gitlab/gitaly_client/commit.rb
@@ -5,6 +5,23 @@ module Gitlab
       # See http://stackoverflow.com/a/40884093/1856239 and https://github.com/git/git/blob/3ad8b5bf26362ac67c9020bf8c30eee54a84f56d/cache.h#L1011-L1012
       EMPTY_TREE_ID = '4b825dc642cb6eb9a060e54bf8d69288fbee4904'.freeze
 
+      attr_accessor :stub
+
+      def initialize(repository)
+        @gitaly_repo = repository.gitaly_repository
+        @stub = Gitaly::Commit::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
+      end
+
+      def is_ancestor(ancestor_id, child_id)
+        request = Gitaly::CommitIsAncestorRequest.new(
+          repository: @gitaly_repo,
+          ancestor_id: ancestor_id,
+          child_id: child_id
+        )
+
+        @stub.commit_is_ancestor(request).value
+      end
+
       class << self
         def diff_from_parent(commit, options = {})
           repository = commit.project.repository
@@ -20,18 +37,6 @@ module Gitlab
 
           Gitlab::Git::DiffCollection.new(stub.commit_diff(request), options)
         end
-
-        def is_ancestor(repository, ancestor_id, child_id)
-          gitaly_repo = repository.gitaly_repository
-          stub = Gitaly::Commit::Stub.new(nil, nil, channel_override: repository.gitaly_channel)
-          request = Gitaly::CommitIsAncestorRequest.new(
-            repository: gitaly_repo,
-            ancestor_id: ancestor_id,
-            child_id: child_id
-          )
-
-          stub.commit_is_ancestor(request).value
-        end
       end
     end
   end