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

x/build: git history rewrite #26199

Closed
bradfitz opened this issue Jul 3, 2018 · 3 comments

Comments

Projects
None yet
3 participants
@bradfitz
Copy link
Member

commented Jul 3, 2018

I'm rewriting Go's history to remove a bad merge (66b2401) and its revert commit (184c706) while preserving the two valid commits that follow.

Steps:

git reset --hard 0e0cd70ecf6b5f0d9c8271f68b8fcc9f85cd6598
git cherry-pick 198679832ad627ee88ed5b3d75cc96819889a51c
git cherry-pick d592ac1c96efa323019a03133bea0ae7c6e0be32

/cc @andybons @ianlancetaylor @FiloSottile

@gopherbot gopherbot added this to the Unreleased milestone Jul 3, 2018

@gopherbot gopherbot added the Builders label Jul 3, 2018

@bradfitz

This comment has been minimized.

Copy link
Member Author

commented Jul 3, 2018

Done.

And left comments on the two CLs which had their git commits rewritten:

https://go-review.googlesource.com/c/go/+/121915/3
https://go-review.googlesource.com/c/go/+/121916/4

@bradfitz bradfitz closed this Jul 3, 2018

@mvdan

This comment has been minimized.

Copy link
Member

commented Jul 3, 2018

Thanks for taking care of this, @bradfitz!

@bradfitz

This comment has been minimized.

Copy link
Member Author

commented Jul 3, 2018

For the record, I also ended up having to clean up some datastore entities in the build.golang.org App Engine app and then restart gitmirror.

We should root out all these issues in gitmirror + the x/build/app so force pushes aren't so painful in the future.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.