Commit dc00562f authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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

parents d3450ad2 a8179934
...@@ -146,10 +146,8 @@ module Gitlab ...@@ -146,10 +146,8 @@ module Gitlab
repo.remote_fetch('source') repo.remote_fetch('source')
repo.git.checkout(default_options({b: true}), merge_request.target_branch, "origin/#{merge_request.target_branch}") repo.git.checkout(default_options({b: true}), merge_request.target_branch, "origin/#{merge_request.target_branch}")
else 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.source_branch}")
repo.git.checkout(default_options, "#{merge_request.target_branch}") repo.git.checkout(default_options({t: true}), "origin/#{merge_request.target_branch}")
end end
rescue Grit::Git::CommandFailed => ex rescue Grit::Git::CommandFailed => ex
handle_exception(ex) handle_exception(ex)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment