Skip to content

AGENTS.md: include the base-tag in the OID-stabilization fast-export #197

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.

Sign up for GitHub

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

Draft
dscho wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

AGENTS.md: include the base-tag in the OID-stabilization fast-export #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,18 @@ inside the package directory and use it to rebase the patches:
mismatched committer date there changes the OID of every
descendant. If any lines appear, fix them with:

git fast-export --no-data HEAD | \
git fast-export --no-data refs/tags/<base-tag> HEAD | \
awk '/^author /{a=$0} /^committer /{$0="committer " substr(a,8)} 1' | \
git fast-import --force --quiet

Then update the tag and branch ref (`git checkout <branch>`).
Note that `<base-tag>` (the new tarball's import commit) is
passed to `fast-export` alongside `HEAD`. Without it, the tag
keeps pointing at the pre-rewrite import commit, so step 6's
`format-patch <base-tag>..HEAD` ends up emitting the multi-MB
tarball-import as a spurious patch 0001. Listing the tag here
makes `fast-import` recreate it pointing at the rewritten
import commit.
6. `git format-patch --no-signature -o ../.. <base-tag>` to export
back to the PKGBUILD directory.
7. Verify the round-trip: re-export `format-patch` from the
Expand Down