diff options
| -rw-r--r-- | lib/github/import.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/github/import.rb b/lib/github/import.rb index 96b69d78c55..f12f979ae02 100644 --- a/lib/github/import.rb +++ b/lib/github/import.rb @@ -160,8 +160,7 @@ module Github next unless merge_request.new_record? && pull_request.valid? begin - restore_source_branch(pull_request) unless pull_request.source_branch_exists? - restore_target_branch(pull_request) unless pull_request.target_branch_exists? + restore_branches(pull_request) author_id = user_id(pull_request.author, project.creator_id) merge_request.iid = pull_request.iid @@ -310,6 +309,11 @@ module Github end end + def restore_branches(pull_request) + restore_source_branch(pull_request) unless pull_request.source_branch_exists? + restore_target_branch(pull_request) unless pull_request.target_branch_exists? + end + def restore_source_branch(pull_request) repository.create_branch(pull_request.source_branch_name, pull_request.source_branch_sha) end |