Rebase does not move the branch being rebased

[Kinrany]

Creating a separate issue from #303

Repro: https://github.com/Kinrany/repro-git-stack

Originally the problem was that all branches were being moved onto a single commit. I think I understand that behavior now: all of the commits there were created with --allow-empty. Might make sense to add an exception for commits that are explicitly empty though?

With this new repro, there's another unexpected behavior. I'm moving main2 onto main. main includes all of the commits in main2, however there are other branches on top of main2. For some reason git stack --rebase --onto main moves all those other branches but not main2 itself.

[epage]

Originally the problem was that all branches were being moved onto a single commit. I think I understand that behavior now: all of the commits there were created with --allow-empty. Might make sense to add an exception for commits that are explicitly empty though?

Empty commits do not matter. If there is also a problem there, please open another issue.

When looking at #303, an issue I noticed is that our logic for updating to the latest commit of a remote was causing main to move to point to main2 which it shouldn't.

[epage]

With this new repro, there's another unexpected behavior. I'm moving main2 onto main. main includes all of the commits in main2, however there are other branches on top of main2. For some reason git stack --rebase --onto main moves all those other branches but not main2 itself.

One of two things is happening

• We assume --base is untouchable,. only moving things on top of it
• We are extra cautious when a branch points to protected commits