diff options
Diffstat (limited to 'lib/gitlab/bitbucket_import/importer.rb')
| -rw-r--r-- | lib/gitlab/bitbucket_import/importer.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/bitbucket_import/importer.rb b/lib/gitlab/bitbucket_import/importer.rb index e785ce558db..7f228c19b6b 100644 --- a/lib/gitlab/bitbucket_import/importer.rb +++ b/lib/gitlab/bitbucket_import/importer.rb @@ -210,7 +210,11 @@ module Gitlab source_branch_sha = pull_request.source_branch_sha target_branch_sha = pull_request.target_branch_sha - source_branch_sha = project.repository.commit(source_branch_sha)&.sha || source_branch_sha + + source_sha_from_commit_sha = project.repository.commit(source_branch_sha)&.sha + source_sha_from_merge_sha = project.repository.commit(pull_request.merge_commit_sha)&.sha + + source_branch_sha = source_sha_from_commit_sha || source_sha_from_merge_sha || source_branch_sha target_branch_sha = project.repository.commit(target_branch_sha)&.sha || target_branch_sha merge_request = project.merge_requests.create!( |