diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2013-10-04 13:26:48 +0200 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2013-10-04 13:26:48 +0200 |
| commit | a817993439733dd6cd45fed82ddb7f145b1602d9 (patch) | |
| tree | cc00be5acbb237dcf05b032a1d38fa31534879d6 | |
| parent | fa7d75733cf8c861fd6ad479b0397877f5a08332 (diff) | |
| download | gitlab-ce-a817993439733dd6cd45fed82ddb7f145b1602d9.tar.gz | |
Remove outdated comments.
| -rw-r--r-- | lib/gitlab/satellite/merge_action.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/satellite/merge_action.rb b/lib/gitlab/satellite/merge_action.rb index 5d56852f058..d74d4194ff6 100644 --- a/lib/gitlab/satellite/merge_action.rb +++ b/lib/gitlab/satellite/merge_action.rb @@ -146,8 +146,6 @@ 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({t: true}), "origin/#{merge_request.target_branch}") end |