Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: cli/cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: trunk
Choose a base ref
...
head repository: galamdring/github-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 4 commits
  • 9 files changed
  • 2 contributors

Commits on Aug 13, 2026

  1. auth: add per-owner account mapping to fix multi-account token selection 

    When multiple GitHub accounts are configured for the same host, gh always
uses the globally active account's token regardless of which org or user
owns the current repo. This causes commands to silently authenticate as
the wrong user.

This change adds an owner-to-user mapping stored in hosts.yml, and
automatically selects the correct token based on the repo owner resolved
from git remotes at HTTP client construction time. A new command
'gh auth set-user --owner <owner> <username>' manages the mappings.

Fixes #12885
    @galamdring @github-actions
    galamdring authored and github-actions[bot] committed Aug 13, 2026
    Configuration menu
    Copy the full SHA
    f59f502 View commit details
    Browse the repository at this point in the history

  2. Add rebase-and-release workflow for fork maintenance

    @lukemckechnie @github-actions
    lukemckechnie authored and github-actions[bot] committed Aug 13, 2026
    Configuration menu
    Copy the full SHA
    0a59c95 View commit details
    Browse the repository at this point in the history

  3. fix: update test call sites for upstream signature changes 

    NewIsolatedTestConfig now takes a cfgString param, and HttpClientFunc now
takes a remotesFunc param (added in the per-owner account mapping commit).
Fork-added tests were never updated for these, so they failed to compile
once rebased onto the current upstream/trunk.
    @galamdring @github-actions
    galamdring authored and github-actions[bot] committed Aug 13, 2026
    Configuration menu
    Copy the full SHA
    8c2bac7 View commit details
    Browse the repository at this point in the history

  4. ci: surface rebase-and-release conflicts instead of failing silently 

    The scheduled rebase onto upstream/trunk has been failing every week for
the last 2.5 months on the same unresolved conflict, with nothing but a
red check nobody was watching. Abort cleanly on conflict and file (or
update) a tracking issue summarizing what needs manual resolution.
    @galamdring @github-actions
    galamdring authored and github-actions[bot] committed Aug 13, 2026
    Configuration menu
    Copy the full SHA
    9f41e88 View commit details
    Browse the repository at this point in the history
Loading