home/gitlabhq
2
0
Fork 0
mirror of https://github.com/wahyd4/gitlabhq.git synced 2026-08-09 12:46:07 +10:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dmitriy Zaporozhets
2013-10-04 13:26:49 +00:00
parent d3450ad2be a817993439
commit dc00562fa2
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/gitlab/satellite/merge_action.rb
+1 -3
View File
@@ -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)