Skip to content
GitLab
Next
    • GitLab: the DevOps platform
    • Explore GitLab
    • Install GitLab
    • How GitLab compares
    • Get started
    • GitLab docs
    • GitLab Learn
  • Pricing
  • Talk to an expert
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
    Projects Groups Topics Snippets
  • Register
  • Sign in
  • GitLab FOSS GitLab FOSS
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributor statistics
    • Graph
    • Compare revisions
    • Locked files
  • Issues 22
    • Issues 22
    • List
    • Boards
    • Service Desk
    • Milestones
    • Iterations
    • Requirements
  • Merge requests 0
    • Merge requests 0
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Container Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Metrics
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • Code review
    • Insights
    • Issue
    • Repository
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
Collapse sidebar
  • GitLab.orgGitLab.org
  • GitLab FOSSGitLab FOSS
  • Merge requests
  • !9719

Fix name colision when importing GitHub pull requests from forked repositories

  • Review changes

  • Download
  • Patches
  • Plain diff
Merged Gabriel Mazetto requested to merge 29034-fix-github-importer into master Mar 06, 2017
  • Overview 5
  • Commits 3
  • Pipelines 4
  • Changes 3

What does this MR do?

Prefix with namespace and project path, branches from a forked repository to prevent branch name collision (master and master from different repositories).

Proposed pattern: pull/123/company/otherproject/master

See: #29034 (closed)

Are there points in the code the reviewer needs to double check?

Do we have any other pre-defined pattern to follow on the branch naming?

Why was this MR needed?

Import was not working for PRs with branches using the same name on source and target repositories.

Does this MR meet the acceptance criteria?

  • Changelog entry added
  • Documentation created/updated
  • API support added
  • Tests
    • Added for this feature/bug
    • All builds are passing
  • Conform by the merge request performance guides
  • Conform by the style guides
  • Branch has no merge conflicts with master (if it does - rebase it please)
  • Squashed related commits together

What are the relevant issue numbers?

Closes #29034 (closed)

CC @DouweM @xiaogang_gitlab

Assignee
Assign to
Reviewers
Request review from
Time tracking
Source branch: 29034-fix-github-importer