Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents d3450ad2 a8179934
Showing 1 changed file with 1 additions and 3 deletions Show diff stats
lib/gitlab/satellite/merge_action.rb
@@ -146,10 +146,8 @@ module Gitlab
           repo.remote_fetch('source')
           repo.git.checkout(default_options({b: true}), merge_request.target_branch, "origin/#{merge_request.target_branch}")
         else
-          # We can't trust the input here being branch names, we can't always check it out because it could be a relative ref i.e. HEAD~3
-          # we could actually remove the if true, because it should never ever happen (as long as the satellite has been prepared)
           repo.git.checkout(default_options, "#{merge_request.source_branch}")
-          repo.git.checkout(default_options, "#{merge_request.target_branch}")
+          repo.git.checkout(default_options({t: true}), "origin/#{merge_request.target_branch}")
         end
       rescue Grit::Git::CommandFailed => ex
         handle_exception(ex)
...	...	@@ -146,10 +146,8 @@ module Gitlab
146	146	repo.remote_fetch('source')
147	147	repo.git.checkout(default_options({b: true}), merge_request.target_branch, "origin/#{merge_request.target_branch}")
148	148	else
149		- # We can't trust the input here being branch names, we can't always check it out because it could be a relative ref i.e. HEAD~3
150		- # we could actually remove the if true, because it should never ever happen (as long as the satellite has been prepared)
151	149	repo.git.checkout(default_options, "#{merge_request.source_branch}")
152		- repo.git.checkout(default_options, "#{merge_request.target_branch}")
	150	+ repo.git.checkout(default_options({t: true}), "origin/#{merge_request.target_branch}")
153	151	end
154	152	rescue Grit::Git::CommandFailed => ex
155	153	handle_exception(ex)
...	...