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

Fix checkout for driver build. #384

Merged
merged 1 commit into from
Sep 15, 2023
Merged

Fix checkout for driver build. #384

merged 1 commit into from
Sep 15, 2023

Conversation

paulosjca
Copy link
Collaborator

This is a workaround for an error when checking out gRPC v1.58.1 for the driver build.

This is a workaround for an error when checking out gRPC v1.58.1 for the
driver build.
@paulosjca paulosjca added bug Something isn't working release notes: yes Indicates that PR needs to be in release notes labels Sep 15, 2023
@paulosjca paulosjca self-assigned this Sep 15, 2023
@paulosjca
Copy link
Collaborator Author

There is a submodule that causes a problem when cloning and then checkout out v1.58.1. Error message:

error: The following untracked working tree files would be overwritten by checkout:
        third_party/upb/.bazelci/presubmit.yml
        [...other files under third_party/upb...]
Aborting

Copy link
Collaborator

@wanlin31 wanlin31 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like we are forcing the change of the working tree:

       -f, --force
           When switching branches, proceed even if the index or the working tree differs from HEAD, and even if there are untracked files in the way.
           This is used to throw away local changes and any untracked files or directories that are in the way.

Can I ask we we need to force it?

@paulosjca paulosjca merged commit feaf60e into grpc:master Sep 15, 2023
1 check passed
@paulosjca paulosjca deleted the driver branch September 15, 2023 00:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working release notes: yes Indicates that PR needs to be in release notes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants