Did you recently rewrite history?

[antoine-sac]

Describe the bug

Hello,

It looks like you may have recently rewritten the commit history and incidentally broken meta-aws because all referenced commits no longer exist on the master branch.

We cannot set up reproducible builds if commits disappear and years of commits have been rewritten :/

For example, this was the commit for botocore v1.34.157 three weeks ago: https://github.com/boto/botocore/commit/894686f5fc8d1440715877ec361695fb71fc900c

It is no longer attached to any branch so cannot be found.

Related to : https://github.com/aws4embeddedlinux/meta-aws/issues/9442

Expected Behavior

The commits prior to a few weeks ago should still exist in the commit history of a branch.

Current Behavior

Commits have disappeared from the history and broken years of reproducible builds via meta-aws.

For example: 0a2e478bfc813cd7a0f4aa5a58388fc5bf8d77ab 894686f5fc8d1440715877ec361695fb71fc900c 19ce2f58608601c6dce3311045fec0461d7e484d da3918aafc5493478fe2bec86fccb348aef7fdb9

Reproduction Steps

NA

Possible Solution

No response

Additional Information/Context

No response

SDK version used

NA

Environment details (OS name and version, etc.)

NA

[antoine-sac]

There have been multiple force-push commits to master in the past 2 weeks according the repository activity https://github.com/boto/botocore/activity.

With any luck, either @nateprewitt or @hssyoo still have the previous master branch and could rebase and force-push it back to its normal state?

I also imagine anyone with the repo checked out prior to the history rewrite will have the previous commits?

[jonathan343]

Hey @antoine-sac, Thank you for reporting this issue. We’re in the process of restoring the original history in the master branch. We're currently taking steps to make sure we get recover this properly and prevent further issues. We'll post an update once we have more information.

[antoine-sac]

The good news is that all the version tags are still attached to the correct commits, so people using boto/botocore@vx.y.z are not impacted. Although those commits are not attached to the master branch.

An issue only arises for yocto builds because we are forced to also provide the branch of the commit, so we can't use a floating commit.

[antoine-sac]

As a temporary fix, would you be able to create a branch for the "old" master, like temp/fixed_master?

This would allow us to keep using the old commits (matching the version tags) simply by switching branch.

[jonathan343]

Hey @antoine-sac, I just pushed up a temp-master-fix branch. Can you let us know if this resolves your problem or if you run into any other issues?

[zach-welch-aquabyte]

The temp-master-fix fixed my Yocto build that uses meta-aws (after some manual intervention). It is a good short-term workaround that unblocked my development, so thanks for that. Looking forward to seeing the original branch restored and reading the postmortum.

[jonathan343]

We've pushed an update to the master which restores the lost commits and should resolve this issue. @antoine-sac can you switch off the temp-master-fix and verify the new update to master resolves your issue?

[zach-welch-aquabyte]

I can verify that my build now works again using the unmodified scarthgap branch of meta-aws.

[jonathan343]

Thanks for the patience and assistance with resolving this issue! We’ve made updates to our release infrastructure that will prevent us getting in a state where manual pushes to master are required. We encourage anyone using the temp-master-fix branch to migrate off of it ASAP and don’t guarantee its existence forever.

[github-actions[bot]]

This issue is now closed. Comments on closed issues are hard for our team to see. If you need more assistance, please open a new issue that references this one.