Skip to content

feat: support fork PRs in rebase-pr action (#11)#17

Open
tomgrv wants to merge 2 commits into
developfrom
feat/fork-pr-support-rebase-pr
Open

feat: support fork PRs in rebase-pr action (#11)#17
tomgrv wants to merge 2 commits into
developfrom
feat/fork-pr-support-rebase-pr

Conversation

@tomgrv
Copy link
Copy Markdown
Owner

@tomgrv tomgrv commented May 4, 2026

What

Updated rebase-pr/run.sh to detect cross-repository (fork) PRs and dynamically configure a separate Git remote for the head repository, enabling fetch and push to/from the fork instead of always assuming origin.

Why

Closes #11. Previously the script assumed both branches were on origin, causing it to fail for PRs submitted from forks — a common open-source workflow.

Originally flagged by @gemini-code-assist in #10.

How

Uses gh pr view --json isCrossRepository,headRepository to detect fork PRs. If cross-repo:

  • Adds a temporary fork-remote pointing to the fork's clone URL
  • Fetches the head branch from fork-remote instead of origin
  • Pushes the rebased branch back to fork-remote
  • Cleans up the temporary remote via trap on exit

Same-repo PRs continue using origin with no behavioural change.

Checklist

  • Code follows project conventions
  • Tests added or updated
  • Documentation updated (rebase-pr/README.md — mention fork PR support)
  • No breaking changes
  • Ready for review

@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request enhances the rebase-pr action by adding support for pull requests submitted from forks. By dynamically detecting the source repository and configuring temporary remotes, the action now correctly handles rebasing and pushing changes for cross-repository contributions, ensuring a seamless workflow for open-source maintainers.

Highlights

  • Fork PR Detection: Integrated gh pr view with JSON output to identify cross-repository pull requests.
  • Dynamic Remote Configuration: Added logic to dynamically create and clean up a temporary Git remote for fork-based head repositories.
  • Rebase Workflow: Updated fetch and push operations to target the correct remote based on whether the PR originates from a fork or the main repository.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for GitHub and other Google products, sign up here.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request introduces a shell script for automated PR rebasing that leverages the GitHub CLI and temporary git worktrees, including support for fork repositories. The review feedback highlights a critical bug where the script could crash on non-fork PRs due to null JSON property access and suggests refactoring duplicated logic for cleanup traps and output generation into reusable functions to improve maintainability and follow DRY principles.

Comment thread rebase-pr/run.sh Outdated
Comment thread rebase-pr/run.sh
Comment thread rebase-pr/run.sh
@tomgrv tomgrv changed the base branch from main to develop May 4, 2026 07:11
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
@tomgrv
Copy link
Copy Markdown
Owner Author

tomgrv commented May 9, 2026

/rebase

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Improve rebase-pr to handle forked repo

1 participant