Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

clean up remote after faulty patchSet #232

Open
ndhaller opened this issue Apr 15, 2024 · 1 comment
Open

clean up remote after faulty patchSet #232

ndhaller opened this issue Apr 15, 2024 · 1 comment

Comments

@ndhaller
Copy link
Contributor

I have a patchSet that used a remote cherry-pick recipe in 2023 that became invalid in 2024 after a force push was made to the sourceRemote repo's sourceBranch.
patchSet CherryPick:

<CherryPick sha="eaffa1d7ff915d5af484e5e230a4dde41e4b9a00..6cf31e9849f0ea2976fdcb08923c75d7e36ca526" sourceRemote="Edk2StagingRepo" sourceBranch="OpenSSL11_EOL" />

Error message during edkrepo checkout:

Error: Failed to cherry pick the commit eaffa1d7ff915d5af484e5e230a4dde41e4b9a00..6cf31e9849f0ea2976fdcb08923c75d7e36ca526

The issue is after the patchSet checkout failure, the remote repo was not removed, and causes a different error message for other patchSet that use the same remote:

Error: Failed to add the remote Edk2StagingRepo.

Workaround:
After a patchSet checkout failure involving a sourceRemote repo, use git to check for and remove remote that were not cleaned up by edkrepo.

git remote -v
Edk2StagingRepo https://github.com/tianocore/edk2-staging.git (fetch)
Edk2StagingRepo https://github.com/tianocore/edk2-staging.git (push)
git remote remove Edk2StagingRepo
@ndhaller
Copy link
Contributor Author

ndhaller commented Jul 3, 2024

Related pull request:

#257

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

No branches or pull requests

1 participant