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(move): Support on-disk rebases with --fixup #1022

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

feat(move): Support on-disk rebases with --fixup #1022

wants to merge 3 commits into from

Commits on Feb 18, 2024

  1. fix(move): Support on-disk rebases with move --fixup

    @claytonrcarter
    claytonrcarter committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    df1bb08 View commit details
    Browse the repository at this point in the history

  2. temp(on disk fixup): Introduce failing test 

    By adding the named branch, this change exposes a problem where - in some
cases - branches are not moved to the rewritten commit.

Other tests have plenty of branches that are correctly updated during rebase,
both in-mem and on-disk. I suspect that, in this case, the issue is that branch
is on the destination.
    @claytonrcarter
    claytonrcarter committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    d4bbb10 View commit details
    Browse the repository at this point in the history

  3. temp(on disk fixup): Try to fix abandoned branches 

    This is just a hack to fix one specific test failure. I haven't dug into
it, but I assume there is something more interesting happening than the
one case I'm patching with `branch -f ...`
    @claytonrcarter
    claytonrcarter committed Feb 18, 2024
    Configuration menu
    Copy the full SHA
    998b746 View commit details
    Browse the repository at this point in the history