]> git.ipfire.org Git - thirdparty/git.git/commit - sequencer.c
rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`
authorJohannes Schindelin <johannes.schindelin@gmx.de>
Wed, 31 Jul 2019 15:18:49 +0000 (08:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 31 Jul 2019 19:24:07 +0000 (12:24 -0700)
commite1fac531ea9f9dc710f6eeae37ea2b38dd5f9fae
tree05eb1f6f1698a4d68106a323685e2e265ff037a9
parenta63f990d9205d1a781aec310e44edf35e29063a2
rebase -r: do not (re-)generate root commits with `--root` *and* `--onto`

When rebasing a complete commit history onto a given commit, it is
pretty obvious that the root commits should be rebased on top of said
given commit.

To test this, let's kill two birds with one stone and add a test case to
t3427-rebase-subtree.sh that not only demonstrates that this works, but
also that `git rebase -r` works with merge strategies now.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c
sequencer.c
sequencer.h
t/t3427-rebase-subtree.sh