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

Skip merge commits in suggestion #397

Merged
merged 4 commits into from
Nov 7, 2023
Merged

Skip merge commits in suggestion #397

merged 4 commits into from
Nov 7, 2023

Commits on Nov 7, 2023

  1. refactor: remove unused error reasons 

    This compose for backport script failure method was a remnant from when
this action used a shell script to perform the git commands. Most
reasons were dead code.
    @korthout
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    bf66681 View commit details
    Browse the repository at this point in the history

  2. fix: suggest to cherry-pick specific commits 

    The manual instructions still suggested to determine the commits to
cherry-pick by determining the common ancestor (merge-base) of the head
and base refs, first. However, this way has been abandoned for quite
some time now. This especially became a problem now that merge commits
can be skipped, meaning that the suggestion no longer produced a
reliable result.

Instead, we can simply suggest the same as the action does. It knows
exactly which commits to cherry-pick.
    @korthout
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    3e20570 View commit details
    Browse the repository at this point in the history

  3. fix: instruct to resolve conflicts 

    When the cherr-picking failed, it's very likely that there are
conflicts. We should instruct the user to cherry-pick locally and
resolve any conflicts.
    @korthout
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    4fed997 View commit details
    Browse the repository at this point in the history

  4. fix: suggest git switch over checkout 

    The switch command has been around for 4 years now, and while still
marked as experimental, I think it's fine to "switch" to it in the
suggestion for local cherry-picking. It's unlikely that users are using
such old git versions that it doesn't support git switch --create.
    @korthout
    korthout committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    19a4042 View commit details
    Browse the repository at this point in the history