Fix backport bot failing with 'fatal: bad object' on squash merges - #2907
Draft
karthikvetrivel wants to merge 1 commit into
Draft
karthikvetrivel wants to merge 1 commit into
karthikvetrivel wants to merge 1 commit into
Conversation
Signed-off-by: Karthik Vetrivel <kvetrivel@nvidia.com>
karthikvetrivel
force-pushed
the
kv-cherrypick-squash-merge
branch
from
September 17, 2026 16:15
b9b15c4 to
6ec5280
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The bot cherry-picks the SHAs from
pulls.listCommits(), which live on the PR head branch, so after a squash merge those commits are no longer in the runner's clone and git reportsfatal: bad object(see #2900).This change resolves what actually landed on the base branch, keeping the PR's own commits when they are ancestors of it and using
merge_commit_shaotherwise.Copies of this script in k8s-device-plugin, nvidia-container-toolkit and mig-parted need the same fix.