AGENTS.md: include the base-tag in the OID-stabilization fast-export#197
Draft
dscho wants to merge 1 commit into
Draft
AGENTS.md: include the base-tag in the OID-stabilization fast-export#197dscho wants to merge 1 commit into
dscho wants to merge 1 commit into
Conversation
The playground workflow's stabilization step (section "The playground repository", step 5) used to invoke fast-export on HEAD alone. That re-imports the entire ancestry, including the import commits the curl-* style tarball tags reference, with new OIDs. fast-import then leaves the import-tars-created tag pointing at its old commit, which in turn makes `format-patch <base-tag>..HEAD` in step 6 include the rewritten import commit as a spurious patch 0001 with the entire tarball-content as a diff. This was hit while refreshing mingw-w64-curl's patch series for 8.20.0 (commit fb4605a735 in the mingw-w64-curl-8.20.0 branch). The instruction "Then update the tag and branch ref (`git checkout <branch>`)" already implied that something about the tag needs attention, but did not spell out how. The cleanest fix is to pass the base tag's ref alongside HEAD to fast-export, so fast-import re-creates the tag pointing at the rewritten import commit naturally, with no follow-up tag surgery needed. Assisted-by: Claude Opus 4.7 (1M context)(Internal only) Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Document a non-obvious detail in the AGENTS.md playground / stable-OID
workflow: the OID-stabilization
fast-export | awk | fast-importdance must include the base tag (e.g.
refs/tags/curl-8.20.0)alongside
HEAD, otherwise the import-tars-created tag keepsreferencing the pre-rewrite commit and the subsequent
format-patch <base-tag>..HEADemits the entire tarball as aspurious patch 0001.
Hit while refreshing mingw-w64-curl's series for 8.20.0 (#195).
Draft because the change is editorial; happy to ship it once the
mingw-w64-curl PR has merged or independently if you prefer.