Skip to content

fix(ok): resolve mirror-PR fix references by their origin trailer (PRD-7718) (#3085) - #937

Merged
inkeep-oss-sync[bot] merged 1 commit into
mainfrom
copybara/sync
Jul 31, 2026
Merged

fix(ok): resolve mirror-PR fix references by their origin trailer (PRD-7718) (#3085)#937
inkeep-oss-sync[bot] merged 1 commit into
mainfrom
copybara/sync

Conversation

@inkeep-oss-sync

Copy link
Copy Markdown
Contributor

Copybara-translated 1 Inkeep OSS change. Rebase-merge this PR so the prepared commit lands directly on public main.

…D-7718) (#3085)

* fix(ok): resolve mirror-PR fix references by their origin trailer (PRD-7718)

Linear's GitHub linkback attaches the Copybara mirror PR to a ticket whenever the PR title carries the ticket identifier. Write-back treated that reference's merge SHA as a private SHA and trailer-searched it, which can never match (the merge commit IS the mirrored copy), and the all-or-nothing gate then made the whole ticket version-underivable. Self-repo PR references now recover the origin SHA from the merge commit's own GitOrigin-RevId trailer and resolve through the normal mirrored-copy walk, so point-release cherry-picks are found; a trailerless or ambiguous merge commit falls back to direct tag containment of its own SHA.

Observed live on the v0.45.1 write-back run: PRD-7715 and PRD-7696 skipped as version-underivable until the echo attachments were deleted by hand.

* Keep private-repo PRs on the trailer-search path when selfRepo is the origin

GITHUB_REPOSITORY equals the private repo in agents-private CI, which routed private PR refs through the mirror-side branch and broke derivation there.

* Log the trailerless/ambiguous fallback and pin it plus isSelfRepoPr with tests

GitOrigin-RevId: 21c2fd4388e02c20790eb9933f3e2d087d772a68
@inkeep-oss-sync
inkeep-oss-sync Bot merged commit 20b0c55 into main Jul 31, 2026
@inkeep-oss-sync
inkeep-oss-sync Bot deleted the copybara/sync branch July 31, 2026 04:08
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.

1 participant