Skip to content

ci(sync): mirror upstream commit messages when syncing the API#17

Merged
leonardoce merged 1 commit into
mainfrom
dev/sync-meaningful-commits
Jun 24, 2026
Merged

ci(sync): mirror upstream commit messages when syncing the API#17
leonardoce merged 1 commit into
mainfrom
dev/sync-meaningful-commits

Conversation

@mnencia

@mnencia mnencia commented Jun 19, 2026

Copy link
Copy Markdown
Member

The sync workflow committed every update as an identical chore: sync API, so the history carried no information about what changed or where it came from. Replay each upstream commit that touched the synced files as an individual commit instead, reusing its original message and appending a (cherry picked from commit <ref>) trailer like git cherry-pick -x. The trailer doubles as the state anchor that marks where the previous sync stopped. Bare #NNNN references and the commit ref are qualified to cloudnative-pg/cloudnative-pg so they link to the upstream repository rather than to this mirror.

@mnencia mnencia requested a review from a team as a code owner June 19, 2026 16:49
@NiccoloFei NiccoloFei force-pushed the dev/sync-meaningful-commits branch from 553df08 to 09414b8 Compare June 23, 2026 12:18
The sync workflow committed every update as an identical "chore: sync
API", so the history carried no information about what changed or where
it came from. Replay each upstream commit that touched the synced files
as an individual commit instead, reusing its original message and
appending a "(cherry picked from commit <ref>)" trailer like
git cherry-pick -x. The trailer doubles as the state anchor that marks
where the previous sync stopped. Bare "#NNNN" references and the commit
ref are qualified to cloudnative-pg/cloudnative-pg so they link to the
upstream repository rather than to this mirror.

Signed-off-by: Marco Nenciarini <[email protected]>
@leonardoce leonardoce force-pushed the dev/sync-meaningful-commits branch from 09414b8 to 7ef4368 Compare June 24, 2026 07:41
@leonardoce leonardoce merged commit ff2f432 into main Jun 24, 2026
7 checks passed
@leonardoce leonardoce deleted the dev/sync-meaningful-commits branch June 24, 2026 10:02
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.

3 participants