[change_lister] Unshallow fetch to fix git merge-base in shallow clones#457
[change_lister] Unshallow fetch to fix git merge-base in shallow clones#457andrew-anyscale merged 1 commit intomainfrom
Conversation
|
Reviews in this chain: |
Summary of ChangesHello, 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 resolves an issue where Highlights
🧠 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. Changelog
Activity
Using Gemini Code AssistThe 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
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 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
|
There was a problem hiding this comment.
Code Review
This pull request addresses an issue with git merge-base failing in shallow clones, which is common in CI environments. The fix involves unshallowing the repository before trying to find the merge-base. The change is well-supported by a new test case that accurately reproduces the problem and verifies the solution.
My main feedback is a suggestion to improve the robustness of the implementation in raycicmd/change_lister.go. Instead of relying on error-based fallback, I recommend explicitly checking if the repository is shallow first. This will make the logic clearer and the error handling more precise.
Overall, this is a valuable fix for a real-world CI problem.
In CI environments like Buildkite, repos are cloned with --depth=1 and PR heads are fetched with --depth=1, leaving both the master tip and PR commit as grafted roots with no shared history. This causes git merge-base origin/master <commit> to fail with exit status 1. Fix by checking git rev-parse --is-shallow-repository before fetching. If shallow, use --unshallow to fetch the full base branch history so merge-base can find the common ancestor. This avoids masking unrelated errors (network, permissions) that would previously be swallowed by the fallback. Add TestListChangedFiles_ShallowClone to reproduce the failure and verify the fix. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Topic: fix-shallow Signed-off-by: andrew <andrew@anyscale.com>
346a6db to
21ac824
Compare
In CI environments like Buildkite, repos are cloned with --depth=1 and
PR heads are fetched with --depth=1, leaving both the master tip and PR
commit as grafted roots with no shared history. This causes
git merge-base origin/master to fail with exit status 1.
Fix by checking git rev-parse --is-shallow-repository before fetching.
If shallow, use --unshallow to fetch the full base branch history so
merge-base can find the common ancestor. This avoids masking unrelated
errors (network, permissions) that would previously be swallowed by the
fallback.
Add TestListChangedFiles_ShallowClone to reproduce the failure and
verify the fix.
Co-Authored-By: Claude Sonnet 4.6 noreply@anthropic.com
Topic: fix-shallow
Signed-off-by: andrew andrew@anyscale.com