Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: make backport.py more flexible for complex pull requests #7260

Merged
merged 4 commits into from
Nov 21, 2024
Merged

feat: make backport.py more flexible for complex pull requests #7260

merged 4 commits into from
Nov 21, 2024

Commits on Nov 20, 2024

  1. feat: "backport.py --skip X" omits commit X from cherry-picking 

    For example, Weblate-side merge commits from "develop" require "git
cherry-pick -m" and therefore can't be merged en masse even if we wanted
their contents.
    @cfm
    cfm committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    3b8bd5d View commit details
    Browse the repository at this point in the history

  2. fix: call "gh api --paginate" to fetch all commits in a pull request 

    Otherwise only the first 30 commits are returned.
    @cfm
    cfm committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    c46edd1 View commit details
    Browse the repository at this point in the history

  3. refactor: use list comprehension with inline conditional 

    Co-authored-by: Kunal Mehta <[email protected]>
    @cfm @legoktm
    cfm and legoktm committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    f3e54c4 View commit details
    Browse the repository at this point in the history

  4. feat: list skipped commits in pull request 

    thread: #7260 (comment)
    @cfm
    cfm committed Nov 20, 2024
    Configuration menu
    Copy the full SHA
    0574c47 View commit details
    Browse the repository at this point in the history