Merge branch 'zj-force-push-opt-out' into 'master'

Force push is handled by Gitaly now

Closes gitaly#348

See merge request gitlab-org/gitlab-ce!19992

5 files changed, 11 insertions, 46 deletions

diff --git a/lib/gitlab/checks/force_push.rb b/lib/gitlab/checks/force_push.rb
index c9c3050cfc2..87af4a90572 100644
--- a/lib/gitlab/checks/force_push.rb
+++ b/lib/gitlab/checks/force_push.rb
@@ -7,18 +7,10 @@ module Gitlab
         # Created or deleted branch
         return false if Gitlab::Git.blank_ref?(oldrev) || Gitlab::Git.blank_ref?(newrev)
 
-        GitalyClient.migrate(:force_push) do |is_enabled|
-          if is_enabled
-            !project
-              .repository
-              .gitaly_commit_client
-              .ancestor?(oldrev, newrev)
-          else
-            Gitlab::Git::RevList.new(
-              project.repository.raw, oldrev: oldrev, newrev: newrev
-            ).missed_ref.present?
-          end
-        end
+        !project
+          .repository
+          .gitaly_commit_client
+          .ancestor?(oldrev, newrev)
       end
     end
   end
diff --git a/lib/gitlab/git/repository.rb b/lib/gitlab/git/repository.rb
index ab0e6e33db7..7ce90ce170f 100644
--- a/lib/gitlab/git/repository.rb
+++ b/lib/gitlab/git/repository.rb
@@ -1484,10 +1484,6 @@ module Gitlab
         run_git!(args, lazy_block: block)
       end
 
-      def missed_ref(oldrev, newrev)
-        run_git!(['rev-list', '--max-count=1', oldrev, "^#{newrev}"])
-      end
-
       def with_worktree(worktree_path, branch, sparse_checkout_files: nil, env:)
         base_args = %w(worktree add --detach)
 
diff --git a/lib/gitlab/git/rev_list.rb b/lib/gitlab/git/rev_list.rb
index 4e661eceffb..5fdad077eea 100644
--- a/lib/gitlab/git/rev_list.rb
+++ b/lib/gitlab/git/rev_list.rb
@@ -1,5 +1,3 @@
-# Gitaly note: JV: will probably be migrated indirectly by migrating the call sites.
-
 module Gitlab
   module Git
     class RevList
@@ -45,13 +43,6 @@ module Gitlab
                     &lazy_block)
       end
 
-      # This methods returns an array of missed references
-      #
-      # Should become obsolete after https://gitlab.com/gitlab-org/gitaly/issues/348.
-      def missed_ref
-        repository.missed_ref(oldrev, newrev).split("\n")
-      end
-
       private
 
       def execute(args)
diff --git a/spec/lib/gitlab/checks/force_push_spec.rb b/spec/lib/gitlab/checks/force_push_spec.rb
index a65012d2314..0e0788ce974 100644
--- a/spec/lib/gitlab/checks/force_push_spec.rb
+++ b/spec/lib/gitlab/checks/force_push_spec.rb
@@ -1,21 +1,17 @@
 require 'spec_helper'
 
 describe Gitlab::Checks::ForcePush do
-  let(:project) { create(:project, :repository) }
-  let(:repository) { project.repository.raw }
+  set(:project) { create(:project, :repository) }
 
-  context "exit code checking", :skip_gitaly_mock do
-    it "does not raise a runtime error if the `popen` call to git returns a zero exit code" do
-      allow(repository).to receive(:popen).and_return(['normal output', 0])
+  describe '.force_push?' do
+    it 'returns false if the repo is empty' do
+      allow(project).to receive(:empty_repo?).and_return(true)
 
-      expect { described_class.force_push?(project, 'oldrev', 'newrev') }.not_to raise_error
+      expect(described_class.force_push?(project, 'HEAD', 'HEAD~')).to be(false)
     end
 
-    it "raises a GitError error if the `popen` call to git returns a non-zero exit code" do
-      allow(repository).to receive(:popen).and_return(['error', 1])
-
-      expect { described_class.force_push?(project, 'oldrev', 'newrev') }
-        .to raise_error(Gitlab::Git::Repository::GitError)
+    it 'checks if old rev is an anchestor' do
+      expect(described_class.force_push?(project, 'HEAD', 'HEAD~')).to be(true)
     end
   end
 end
diff --git a/spec/lib/gitlab/git/rev_list_spec.rb b/spec/lib/gitlab/git/rev_list_spec.rb
index 95dc47e2a00..b752c3e8341 100644
--- a/spec/lib/gitlab/git/rev_list_spec.rb
+++ b/spec/lib/gitlab/git/rev_list_spec.rb
@@ -93,14 +93,4 @@ describe Gitlab::Git::RevList do
       expect { |b| rev_list.all_objects(&b) }.to yield_with_args(%w[sha1 sha2])
     end
   end
-
-  context "#missed_ref" do
-    let(:rev_list) { described_class.new(repository, oldrev: 'oldrev', newrev: 'newrev') }
-
-    it 'calls out to `popen`' do
-      stub_popen_rev_list('--max-count=1', 'oldrev', '^newrev', with_lazy_block: false, output: "sha1\nsha2")
-
-      expect(rev_list.missed_ref).to eq(%w[sha1 sha2])
-    end
-  end
 end