| commit | b64b7feb730b7a23c7a473a484ba6e68d410c990 | |
| author | Chris Webb <chris@arachsys.com> | |
| Tue, 26 Jun 2012 21:55:24 +0000 (26 22:55 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Jun 2012 22:09:29 +0000 (26 15:09 -0700) | ||
| tree | 4b758a43cadcb94d0afe52f84086d6222519b8df | treesnapshot (tar.gz zip) |
| parent | df5df20c1308f936ea542c86df1e9c6974168472 | commitdiff |
Add tests for rebase -i --root without --onto
Test for likely breakages in t3404, including successful reordering of
non-conflicting changes with a new root, correct preservation of commit
message and author in a root commit when it is squashed with the
sentinel, and presence of the sentinel following a conflicting
cherry-pick of a new root.
Remove test_must_fail for git rebase --root without --onto from t3412 as
this case will now be successfully handled by an implicit git rebase -i.
Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Test for likely breakages in t3404, including successful reordering of
non-conflicting changes with a new root, correct preservation of commit
message and author in a root commit when it is squashed with the
sentinel, and presence of the sentinel following a conflicting
cherry-pick of a new root.
Remove test_must_fail for git rebase --root without --onto from t3412 as
this case will now be successfully handled by an implicit git rebase -i.
Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3404-rebase-interactive.sh | diffblobblamehistory | |
| t/t3412-rebase-root.sh | diffblobblamehistory |