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 error reporting for git checkout of original rev #78

Merged
merged 1 commit into from
Dec 18, 2023

Conversation

jonmeow
Copy link
Contributor

@jonmeow jonmeow commented Dec 18, 2023

I noticed this due to problems with MODULE.bazel.lock in bazel 7.

Example failure: https://github.com/carbon-language/carbon-lang/actions/runs/7250904398/job/19752117231?pr=3514

2023/12/18 16:30:10 failed to process change: failed to check out original commit during cleanup: <nil>

With this change it should look more like:

2023/12/18 08:51:19 failed to process change: failed to check out original commit during cleanup: failed to check out revision 'after' (llvm-bzlmod, sha: 67bcc1f551049d5f29f23d33598f0eda73a23151): exit status 1. Output: error: Your local changes to the following files would be overwritten by checkout:
	MODULE.bazel.lock
Please commit your changes or stash them before you switch branches.

Copy link
Collaborator

@illicitonion illicitonion left a comment

Choose a reason for hiding this comment

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

Thanks!

@illicitonion illicitonion merged commit acfecef into bazel-contrib:main Dec 18, 2023
1 check passed
@jonmeow jonmeow deleted the innererr branch December 18, 2023 17:42
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

Successfully merging this pull request may close these issues.

2 participants