Open Kinrany opened 1 year ago
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.
With this new repro, there's another unexpected behavior. I'm moving
main2
ontomain
.main
includes all of the commits inmain2
, however there are other branches on top ofmain2
. For some reasongit stack --rebase --onto main
moves all those other branches but notmain2
itself.
One of two things is happening
--base
is untouchable,. only moving things on top of it
Creating a separate issue from https://github.com/gitext-rs/git-stack/issues/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
ontomain
.main
includes all of the commits inmain2
, however there are other branches on top ofmain2
. For some reasongit stack --rebase --onto main
moves all those other branches but notmain2
itself.