fix: error when head and base refs are identical in pr create by majiayu000 · Pull Request #12376 · cli/cli

majiayu000 · 2025-12-26T11:14:27Z

Summary

When gh pr create is invoked with head and base refs pointing to the same ref in the same repository, the command now returns an error instead of proceeding with an invalid PR creation.

This addresses the issue where running gh pr create from the base branch (e.g., main) would accidentally push commits to main.

Changes

Added isSameRef() helper function to check if head and base point to identical refs
Added validation in createRun() that errors early when refs are identical
Cross-repository PRs (e.g., from forks) with the same branch name continue to work

Test plan

Added unit tests for isSameRef() function covering:
- Same branch in same repo (should error)
- Different branches in same repo (should work)
- Same branch name in different repos/forks (should work)
Added integration tests in Test_createRun for the error case
All existing tests pass

Fixes #11903

When a user runs `gh pr create` with head and base refs pointing to the same ref in the same repository, the command now exits with an error instead of proceeding with an invalid PR creation. This prevents accidental pushes to the main branch and provides clear feedback when users attempt to create a PR from the base branch. Cross-repository PRs (e.g., from forks) with the same branch name continue to work as expected. Fixes cli#11903 Signed-off-by: majiayu000 <1835304752@qq.com>

Copilot

Pull request overview

This PR fixes a bug where gh pr create would allow creating a pull request when the head and base refs point to the same branch in the same repository, which would result in an invalid PR and could accidentally push commits directly to the base branch (e.g., main).

Changes:

Added isSameRef() helper function that detects when head and base refs are identical in the same repository while still allowing cross-repository PRs (e.g., from forks) with the same branch name
Added early validation in createRun() that returns a clear error message when attempting to create a PR with identical head and base refs
Added comprehensive unit tests for isSameRef() covering same-repo, different-repo, and different ref type scenarios
Added integration tests in Test_createRun validating the error cases

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
pkg/cmd/pr/create/create.go	Added `isSameRef()` helper function and validation check in `createRun()` to prevent PR creation when head and base refs are identical in the same repository
pkg/cmd/pr/create/create_test.go	Added comprehensive unit tests for `isSameRef()` and integration tests for the error cases in `Test_createRun`

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

BagToad

@majiayu000 this looks very good, thank you and apologies for the review delay 🙏 I just left a couple comment nitpicks that once we resolve, I think we're good to merge.

Thank you for testing our createRun func alongside the helper function, ensuring the actual use of the function is tested.
Thank you for leveraging the creationRefs type for this feature.
Overall, thank you for your adherence to existing patterns!

pkg/cmd/pr/create/create.go

Signed-off-by: majiayu000 <1835304752@qq.com>

BagToad

Thank you @majiayu000 this looks good 🙏

This MR contains the following updates: | Package | Update | Change | |---|---|---| | [cli/cli](https://github.com/cli/cli) | minor | `v2.85.0` → `v2.86.0` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>cli/cli (cli/cli)</summary> ### [`v2.86.0`](https://github.com/cli/cli/releases/tag/v2.86.0): GitHub CLI 2.86.0 [Compare Source](cli/cli@v2.85.0...v2.86.0) ####

Install and run GitHub Copilot CLI directly from `gh` Since we deprecated the [GitHub Copilot in the CLI](https://github.blog/changelog/2025-09-25-upcoming-deprecation-of-gh-copilot-cli-extension/) extension in favor of the new agentic [GitHub Copilot CLI](https://github.com/github/copilot-cli), we want to give developers using `gh` a simple way to get started using our most powerful terminal assistant. - `gh copilot` will prompt to install, then run Copilot CLI - `gh copilot <args>` will execute the Copilot CLI, forwarding any arguments and flags For more information and usage options, run `gh copilot --help`. #### What's Changed ##### ✨ Features - `gh copilot`: add native `copilot` command to execute/install copilot cli by [@devm33](https://github.com/devm33) in [#12444](cli/cli#12444) - `gh cache delete`: allow for delete all caches for a ref by [@davidspek](https://github.com/davidspek) in [#12101](cli/cli#12101) - `gh pr create`: error when head and base refs are identical in pr create by [@majiayu000](https://github.com/majiayu000) in [#12376](cli/cli#12376) ##### 📚 Docs & Chores - Fix Windows asset URL in `copilot` command tests by [@babakks](https://github.com/babakks) in [#12500](cli/cli#12500) - Update contributing guidelines for clarity by [@BagToad](https://github.com/BagToad) in [#12505](cli/cli#12505) #### New Contributors - [@devm33](https://github.com/devm33) made their first contribution in [#12444](cli/cli#12444) - [@davidspek](https://github.com/davidspek) made their first contribution in [#12101](cli/cli#12101) **Full Changelog**: <cli/cli@v2.85.0...v2.86.0> </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

majiayu000 requested a review from a team as a code owner December 26, 2025 11:14

majiayu000 requested a review from BagToad December 26, 2025 11:14

majiayu000 temporarily deployed to cli-automation December 26, 2025 11:14 — with GitHub Actions Inactive

cliAutomation added the external pull request originating outside of the CLI core team label Dec 26, 2025

Merge branch 'trunk' into fix-11903-pr-create-same-ref

c4fd102

BagToad requested a review from Copilot January 20, 2026 18:33

Copilot started reviewing on behalf of BagToad January 20, 2026 18:33 View session

Copilot AI reviewed Jan 20, 2026

View reviewed changes

BagToad reviewed Jan 20, 2026

View reviewed changes

pkg/cmd/pr/create/create.go Show resolved Hide resolved

pkg/cmd/pr/create/create.go Outdated Show resolved Hide resolved

refactor: address review comments

0f4b9b0

Signed-off-by: majiayu000 <1835304752@qq.com>

BagToad approved these changes Jan 21, 2026

View reviewed changes

BagToad merged commit 49f7223 into cli:trunk Jan 21, 2026
11 checks passed

This comment was marked as spam.

Sign in to view

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: error when head and base refs are identical in pr create#12376

fix: error when head and base refs are identical in pr create#12376
BagToad merged 3 commits intocli:trunkfrom
majiayu000:fix-11903-pr-create-same-ref

majiayu000 commented Dec 26, 2025

Uh oh!

Copilot AI left a comment

Uh oh!

BagToad left a comment

Uh oh!

Uh oh!

Uh oh!

BagToad left a comment

Uh oh!

Uh oh!

This comment was marked as spam.

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

majiayu000 commented Dec 26, 2025

Summary

Changes

Test plan

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

BagToad left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

BagToad left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

This comment was marked as spam.

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants