Ignore symbolic refs that point to deleted branches

Author: stanhu

CHANGELOG

@@ -1,3 +1,6 @@
+v 7.2.8
+  - Ignore symbolic refs that point to deleted branches (Stan Hu)
+
 v 7.2.7
   - Include branch/tag name in archive file and dirname
 

Gemfile

@@ -6,6 +6,7 @@ group :development do
   gem 'rubocop'
   gem 'coveralls', require: false
   gem 'rspec'
+  gem 'rspec-mocks'
   gem 'webmock'
   gem 'guard'
   gem 'guard-rspec'

Gemfile.lock

@@ -116,6 +116,10 @@ DEPENDENCIES
   pry
   rake
   rspec
+  rspec-mocks
   rubocop
   simplecov
   webmock
+
+BUNDLED WITH
+   1.10.5

lib/gitlab_git/repository.rb

@@ -53,8 +53,12 @@ def branch_names
       # Returns an Array of Branches
       def branches
         rugged.branches.map do |rugged_ref|
-          Branch.new(rugged_ref.name, rugged_ref.target)
-        end.sort_by(&:name)
+          begin
+            Branch.new(rugged_ref.name, rugged_ref.target)
+          rescue Rugged::ReferenceError
+            # Omit invalid branch
+          end
+        end.compact.sort_by(&:name)
       end
 
       # Returns an Array of tag names

spec/repository_spec.rb

@@ -637,4 +637,17 @@
       @repo.rugged.config.delete('core.autocrlf')
     end
   end
+
+  describe '#branches with deleted branch' do
+    before(:each) do
+      ref = double()
+      ref.stub(:name) { 'bad-branch' }
+      ref.stub(:target) { raise Rugged::ReferenceError }
+      repository.rugged.stub(:branches) { [ref] }
+    end
+
+    it 'should return empty branches' do
+      expect(repository.branches).to eq([])
+    end
+  end
 end