Skip to content

Rebase sierra-release-branch onto upstream release v0.17.94 - #4

Merged
jaked merged 0 commit into
sierra-release-branchfrom
sierra-release-branch-rebased
Aug 18, 2026
Merged

Rebase sierra-release-branch onto upstream release v0.17.94#4
jaked merged 0 commit into
sierra-release-branchfrom
sierra-release-branch-rebased

Conversation

@jaked

@jaked jaked commented Aug 18, 2026

Copy link
Copy Markdown

I want to pick up 99designs#4086 which should make it so we don't regenerate so many files when making GraphQL type changes.


Replays the 3 Sierra-only commits from sierra-release-branch onto upstream 99designs/gqlgen tag v0.17.94 (690713b8, released 2026-07-09) — the latest upstream release.

The branch was previously based on release tag v0.17.86 (4079e8dc), so rebasing onto a release tag rather than a moving master preserves that property: the fork stays anchored to a released, tagged upstream version.

Note that sierra-inc/gqlgen's own master was 208 commits behind 99designs, so it was not a useful target.

Commits

99bfeedf perf(resolvergen): replace packages.Load with parser.ParseDir in rewriter (#1)
b7ba2faf perf(codegen): remove redundant ReloadAllPackages from BuildData (#2)
e550b197 Feat/collectfields cache syncmap benchmark (#3)

Conflict resolution

codegen/field.go — upstream changed contains(...) to slices.Contains(...) on the exact line whose body #3 rewrote. Took upstream's slices.Contains.

plugin/federation/federation.go — pure formatting conflict; took upstream's.

Dropped churn (intentional). Commit #3 originally bundled unrelated WriteString(fmt.Sprintf(...))fmt.Fprintf(...) lint changes across codegen/directive.go, codegen/field.go, and plugin/federation/federation.go. Upstream has since made those exact conversions itself, so the replayed commit is now purely the sync.Map cache change plus its tests. git range-diff confirms commit #1 is otherwise byte-identical and #2 differs only in surrounding context.

Semantic fix (not a textual conflict). Upstream added a parentIsDeferredFragment bool parameter to collectFields. Three call sites in the new benchmark/stress tests were updated to pass false, matching the top-level CollectFields entry point in graphql/executable_schema.go. Git could not detect this — it rebased without conflict and simply failed to compile, surfacing only under go vet.

Verification

All run at this branch tip:

  • go build ./... — clean
  • go vet ./... — clean
  • go test ./... — full suite passes
  • go generate ./...no diff, working tree clean

⚠️ Merging

This is a history rewrite, not an incremental change. Do not merge normally — a merge commit would defeat the rebase and reintroduce the pre-rebase history. Instead force-update sierra-release-branch to this tip:

git push --force-with-lease origin sierra-release-branch-rebased:sierra-release-branch

sierra-release-branch is untouched until someone does that.

🤖 Generated with Claude Code

@jaked
jaked force-pushed the sierra-release-branch-rebased branch from 674293b to e550b19 Compare August 18, 2026 20:54
@jaked jaked changed the title Rebase sierra-release-branch onto upstream gqlgen master (a447c5af) Rebase sierra-release-branch onto upstream release v0.17.94 Aug 18, 2026
@jaked
jaked requested a review from rohith-sierra August 18, 2026 21:07
@jaked
jaked merged commit e550b19 into sierra-release-branch Aug 18, 2026
@jaked
jaked force-pushed the sierra-release-branch branch from 51df737 to e550b19 Compare August 18, 2026 21:19
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