Subtree update automation: use fast version of subtree split #270
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
zhassan-aws
reviewed
Mar 12, 2025
rajath-mk
reviewed
Mar 12, 2025
rajath-mk
approved these changes
Mar 12, 2025
repo-filter does not produce consistent SHA hashes. While we were aware of this, we hadn't realized that this made incremental non-interactive updates of the branch a matter of luck as git may or may not be able to automatically resolve conflicts. (It worked for the update to 2025-02-10, but failed for the next one.) git-subtree-split does produce consistent SHA hashes, but the native `git-subtree-split` implementation is a shell script, and thus was found to be too slow (which is why we chose repo-filter in the first place). splitsh-lite is an implementation of just the `subtree split` command in Go and libgit2. This makes `subtree split` even faster than `repo-filter` at 35 seconds vs 50 seconds (on a GitHub runner).
tautschnig
force-pushed
the
fix-automation
branch
from
c95d0ec to
ff7f6d2
Compare
Merged
via the queue into
model-checking:main
with commit Mar 13, 2025
9b27cfb
15 of 17 checks passed
tautschnig
added a commit
to tautschnig/verify-rust-std
that referenced
this pull request
Mar 18, 2025
This restores a fix from model-checking#250 that was deemed no longer necessary with the move to subtree split (in model-checking#270), but this proved to be wrong. (See model-checking@ab648fe for such an example of an unintended change.)
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 19, 2025
This restores a fix from #250 that was deemed no longer necessary with the move to subtree split (in #270), but this proved to be wrong. (See ab648fe for such an example of an unintended change.) By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses. Co-authored-by: thanhnguyen-aws <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
repo-filter does not produce consistent SHA hashes. While we were aware of this, we hadn't realized that this made incremental non-interactive updates of the branch a matter of luck as git may or may not be able to automatically resolve conflicts. (It worked for the update to 2025-02-10, but failed for the next one.)
git-subtree-split does produce consistent SHA hashes, but the native
git-subtree-splitimplementation is a shell script, and thus was found to be too slow (which is why we chose repo-filter in the first place).splitsh-lite is an implementation of just the
subtree splitcommand in Go and libgit2. This makessubtree spliteven faster thanrepo-filterat 35 seconds vs 50 seconds (on a GitHub runner).By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 and MIT licenses.