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

Don't sort hunks based on dest_commit. #123

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't sort hunks based on dest_commit. #123

wants to merge 1 commit into from

Commits on Oct 15, 2024

  1. Don't sort hunks based on dest_commit. 

    Because each hunk needs to be displaced based on the previously
applied hunk, sorting hunks will change the order in which they are
applied, therefore undoing all our previous calculations.

This fixes tummychow#116, but breaks the --one-fixup-per-commit feature in
cases where there is an odd hunk in between some hunks that could've
been merged together.
    @rbartlensky
    rbartlensky committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    d2e42b6 View commit details
    Browse the repository at this point in the history