Reset parking branch to HEAD everytime

* Reduces overhead of git checkout

Reset parking branch to HEAD everytime
* Reduces overhead of git checkout
a3001137 · nicklegr · d554070a · a3001137
Commit a3001137 authored Mar 25, 2015 by nicklegr
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

lib/gitlab/satellite/satellite.rb lib/gitlab/satellite/satellite.rb +1 -5

No files found.
--- a/lib/gitlab/satellite/satellite.rb
+++ b/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(default_options({ B: true }), PARKING_BRANCH)
-          repo.git.checkout({}, PARKING_BRANCH)
-        else
-          repo.git.checkout(default_options({ b: true }), PARKING_BRANCH)
-        end
        # remove the parking branch from the list of heads ...
        heads.delete(PARKING_BRANCH)