git pipeline: fix cherry-picking multiple commits #2284
Merged
Conversation
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
The commit 149f46c ("git-checkout: Invoke `git fetch` with `--unshallow` (chainguard-dev#2258)") attempted to ensure that commits for cherry-picking could be found by adding the `--unshallow` argument; however this fails when cherry-picking multiple commits because calling `git fetch --unshallow` on a repo that is not a shallow checkout causes a fatal error: ``` [git checkout] Cherry-picked 582b4d7d62f1c512568649ce8b6db085a3d85a9f from main with comment: here comment [git checkout] execute: git fetch --unshallow origin cpick:cpick [git checkout] failed to fetch branch cpick [git checkout] FAIL failed to apply cherry-pick WARN fatal: --unshallow on a complete repository does not make sense ``` Fix this by only passing the `--unshallow` argument if the repository is in a shallow state and update the e2e tests to check for this condition. fixes: 149f46c ("git-checkout: Invoke `git fetch` with `--unshallow` (chainguard-dev#2258)") Signed-off-by: Steve Beattie <[email protected]>
egibs
approved these changes
Jan 1, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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 commit 149f46c ("git-checkout: Invoke
git fetchwith--unshallow(#2258)") attempted to ensure that commits for cherry-picking could be found by adding the--unshallowargument; however this fails when cherry-picking multiple commits because callinggit fetch --unshallowon a repo that is not a shallow checkout causes a fatal error:Fix this by only passing the
--unshallowargument if the repository is in a shallow state and update the e2e tests to check for this condition.fixes: 149f46c ("git-checkout: Invoke
git fetchwith--unshallow(#2258)")