Skip to content

Conversation

@zhan7236
Copy link

The beam-linkage-check.sh script fails to restore the original git position when starting from a detached HEAD state. This commonly happens when verifying someone else's PR, which involves merging two non-branch references.

Root Cause:
The script used git rev-parse --abbrev-ref HEAD which returns the string "HEAD" in detached state instead of a valid reference. The cleanup function then fails to restore the original position.

Fix:

  • Use git rev-parse HEAD to get the full commit SHA instead of branch name
  • Add -c advice.detachedHead=false to suppress warnings during cleanup checkout

Fixes #20558


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

The beam-linkage-check.sh script previously used 'git rev-parse --abbrev-ref HEAD'
to save the current position before switching branches. When in detached HEAD state
(common when verifying PRs), this returns the string 'HEAD' instead of a valid ref,
causing the cleanup function to fail to restore the original position.

This change:
- Uses 'git rev-parse HEAD' to get the full commit SHA instead of branch name
- Adds '-c advice.detachedHead=false' to suppress warnings in cleanup
- Adds explanatory comments

Fixes apache#20558
@gemini-code-assist
Copy link
Contributor

Summary of Changes

Hello @zhan7236, 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 addresses a bug in the beam-linkage-check.sh script where it failed to correctly restore the Git repository's state after execution, specifically when the repository was in a detached HEAD state. The changes ensure that the script can reliably return to the original Git position without issues or warnings, improving the developer experience when verifying pull requests.

Highlights

  • Fix beam-linkage-check.sh in detached HEAD state: The script previously failed to restore the original git position when the repository was in a detached HEAD state, which commonly occurs when verifying pull requests.
  • Use full commit SHA for STARTING_REF: Changed git rev-parse --abbrev-ref HEAD to git rev-parse HEAD to correctly capture the full commit SHA, ensuring proper restoration of the git state.
  • Suppress detached HEAD warnings: Added -c advice.detachedHead=false to the git checkout command in the cleanup function to prevent warnings when returning from a detached HEAD state.
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.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

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.

@github-actions
Copy link
Contributor

Assigning reviewers:

R: @kennknowles for label java.
R: @Abacn for label build.

Note: If you would like to opt out of this review, comment assign to next reviewer.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Linkage check script assumes you are on a branch

1 participant