diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-04 13:26:49 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-10-04 13:26:49 +0000 |
| commit | dc00562fa25fbe69273f58b414fa35ddf4e44c12 (patch) | |
| tree | abd35ce80046fbf93c1f9e7215e7edf12dfc9e61 | |
| parent | d3450ad2be3d8f7ee445b11a97f6eca77e504b2f (diff) | |
| parent | a817993439733dd6cd45fed82ddb7f145b1602d9 (diff) | |
| download | gitlab-ce-dc00562fa25fbe69273f58b414fa35ddf4e44c12.tar.gz | |
Merge branch 'satellite_merge' of /home/git/repositories/gitlab/gitlabhq
| -rw-r--r-- | lib/gitlab/satellite/merge_action.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb index 156483be8dd..d74d4194ff6 100644 --- a/lib/gitlab/satellite/merge_action.rb +++ b/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) |