Skip to content

Re-pin go-diskfs to latest master, drop fork replace#20

Merged
deitch merged 1 commit into
diskfs:mainfrom
eriknordmark:source-fsck-preflight
Jun 19, 2026
Merged

Re-pin go-diskfs to latest master, drop fork replace#20
deitch merged 1 commit into
diskfs:mainfrom
eriknordmark:source-fsck-preflight

Conversation

@eriknordmark

@eriknordmark eriknordmark commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Bump github.com/diskfs/go-diskfs to the 2026-06-18 master tip, which now carries the ErrReReadDeferred change from diskfs/go-diskfs#411, and remove the temporary replace github.com/diskfs/go-diskfs => github.com/eriknordmark/go-diskfs directive. go mod tidy also prunes the stale go.sum entries left from the fork pin.

The replace was only ever meant to pin the pre-merge fork commit and be dropped once #411 landed in master. It was added in #15, where Claude broke its own rule: a temporary fork-pinning replace must be dropped before the PR merges, never carried into main. #15 merged with it still in tree, leaving upstream main depending on a personal fork; this PR removes it and re-pins to the real master tag.

@eriknordmark

Copy link
Copy Markdown
Contributor Author

@deitch this re-pins partitionresizer onto go-diskfs master, which now includes #411. Ready for review when you have a chance.

@deitch

deitch commented Jun 18, 2026

Copy link
Copy Markdown
Contributor

Test timed out. I restarted it, but might be worth extending the test maximum time.

@eriknordmark

Copy link
Copy Markdown
Contributor Author

Test timed out. I restarted it, but might be worth extending the test maximum time.

The other or already extends the timeout. Marge that one first then this one after a rebase?

@deitch

deitch commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

Done. Rebase this, and you should be good to go.

@eriknordmark eriknordmark force-pushed the source-fsck-preflight branch from 70fb698 to b282e12 Compare June 19, 2026 07:22
@eriknordmark eriknordmark changed the title Re-pin go-diskfs to latest master Re-pin go-diskfs to latest master, drop fork replace Jun 19, 2026
Bump github.com/diskfs/go-diskfs to the 2026-06-18 master tip, which now
carries the ErrReReadDeferred change from diskfs/go-diskfs#411, and remove
the temporary `replace => github.com/eriknordmark/go-diskfs` directive. go
mod tidy also prunes the stale go.sum entries left from the fork pin.

The replace was only ever meant to pin the pre-merge fork commit and be
dropped once #411 landed in master. It was added in diskfs#15, where Claude broke
its own rule: a temporary fork-pinning replace must be dropped before the
PR merges, never carried into main. diskfs#15 merged with it still in tree,
leaving upstream main depending on a personal fork; this commit removes it.

Signed-off-by: eriknordmark <erik@zededa.com>
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@eriknordmark eriknordmark force-pushed the source-fsck-preflight branch from b282e12 to 91467d9 Compare June 19, 2026 07:34
@eriknordmark

Copy link
Copy Markdown
Contributor Author

Done. Rebase this, and you should be good to go.

Done. Sorry for the mess-up in #15, but I can't promise claude won't mess up again.

@deitch

deitch commented Jun 19, 2026

Copy link
Copy Markdown
Contributor

promise claude won't mess up again

I think the one thing you can promise about probabilistic engines is that they will do the same thing different ways with different outcomes each time. 😁

@deitch deitch merged commit 1f93724 into diskfs:main Jun 19, 2026
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants