Fix failed merge when filename is the same as target branchname.

Marin Jankovski
1 parent 970d86b7
Showing 1 changed file with 1 additions and 1 deletions Show diff stats
lib/gitlab/satellite/merge_action.rb
@@ -149,7 +149,7 @@ module Gitlab
           # 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)
...	...	@@ -149,7 +149,7 @@ module Gitlab
149	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	150	# we could actually remove the if true, because it should never ever happen (as long as the satellite has been prepared)
151	151	repo.git.checkout(default_options, "#{merge_request.source_branch}")
152		- repo.git.checkout(default_options, "#{merge_request.target_branch}")
	152	+ repo.git.checkout(default_options({t: true}), "origin/#{merge_request.target_branch}")
153	153	end
154	154	rescue Grit::Git::CommandFailed => ex
155	155	handle_exception(ex)
...	...