Merge branch '59257-find-new-branches-harder' into 'master'

Look for new branches more carefully

Closes #59257

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

1 files changed, 34 insertions, 0 deletions

diff --git a/spec/services/git/branch_hooks_service_spec.rb b/spec/services/git/branch_hooks_service_spec.rb
index b5694628269..23be400059e 100644
--- a/spec/services/git/branch_hooks_service_spec.rb
+++ b/spec/services/git/branch_hooks_service_spec.rb
@@ -344,4 +344,38 @@ describe Git::BranchHooksService do
       end
     end
   end
+
+  describe 'New branch detection' do
+    let(:branch) { 'fix' }
+
+    context 'oldrev is the blank SHA' do
+      let(:oldrev) { Gitlab::Git::BLANK_SHA }
+
+      it 'is treated as a new branch' do
+        expect(service).to receive(:branch_create_hooks)
+
+        service.execute
+      end
+    end
+
+    context 'oldrev is set' do
+      context 'Gitaly does not know about the branch' do
+        it 'is treated as a new branch' do
+          allow(project.repository).to receive(:branch_names) { [] }
+
+          expect(service).to receive(:branch_create_hooks)
+
+          service.execute
+        end
+      end
+
+      context 'Gitaly knows about the branch' do
+        it 'is not treated as a new branch' do
+          expect(service).not_to receive(:branch_create_hooks)
+
+          service.execute
+        end
+      end
+    end
+  end
 end