Merge pull request #9021 from nicklegr/faster_auto_merge

Faster merge request processing for large repository

CHANGELOG

@@ -39,6 +39,7 @@ v 7.10.0 (unreleased)
   - Link note avatar to user.
   - Make Git-over-SSH errors more descriptive.
   - Send EmailsOnPush email when branch or tag is created or deleted.
+  - Faster merge request processing for large repository
 
 v 7.9.0
   - Add HipChat integration documentation (Stan Hu)

lib/gitlab/satellite/satellite.rb

@@ -99,11 +99,7 @@ module Gitlab
         heads = repo.heads.map(&:name)
 
         # update or create the parking branch
-        if heads.include? PARKING_BRANCH
-          repo.git.checkout({}, PARKING_BRANCH)
-        else
-          repo.git.checkout(default_options({ b: true }), PARKING_BRANCH)
-        end
+        repo.git.checkout(default_options({ B: true }), PARKING_BRANCH)
 
         # remove the parking branch from the list of heads ...
         heads.delete(PARKING_BRANCH)