Updated as per Jacob's comments

2 files changed, 3 insertions, 6 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index fc15aa57f8f..3ca0a73f1e5 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -207,11 +207,8 @@ class Repository
 
   def branch_exists?(branch_name)
     if raw_repository
-      @branch_exists_memo ||= {}
-      return @branch_exists_memo[branch_name] if @branch_exists_memo.key?(branch_name)
-      result = raw_repository.branch_exists?(branch_name)
-      @branch_exists_memo[branch_name] = result
-      result
+      @branch_exists_memo ||= Hash.new { |h, k| h[k] = raw_repository.branch_exists?(k) }
+      @branch_exists_memo[branch_name]
     else
       false
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index db9d6ff1c6c..8e04eea56a7 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -1356,7 +1356,7 @@ describe User do
     end
 
     it "excludes push event if branch has been deleted" do
-      allow_any_instance_of(Repository).to receive(:branch_exists?).and_return(false)
+      allow_any_instance_of(Repository).to receive(:branch_exists?).with('master').and_return(false)
 
       expect(subject.recent_push).to eq(nil)
     end