python / cherry-picker

🐍🍒⛏ Utility script for backporting/cherry-picking CPython changes from master into one of the maintenance branches.
Apache License 2.0
46 stars 38 forks source link

Respect existing trailers (including co-author lines) when backporting #46

Closed Jackenmen closed 1 year ago

Jackenmen commented 2 years ago

Fixes https://github.com/python/miss-islington/issues/439

Jackenmen commented 2 years ago

A small issue with this is that for a single commit PR, GitHub UI shows the trailers that are part of that single commit and it appends the trailers on its own too which causes them to be duplicated: image

This doesn't break the actual functionality so that I don't think it's a big issue, and CPython probably relies on miss-islington's auto-merge so it might not even be an issue there anyway.

Either way, figured this quirk with GH UI is worth mentioning.