diff options
author | Chris Webb <chris@arachsys.com> | 2012-06-26 22:55:24 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-06-26 15:09:29 -0700 |
commit | b64b7feb730b7a23c7a473a484ba6e68d410c990 (patch) | |
tree | 4b758a43cadcb94d0afe52f84086d6222519b8df /test-chmtime.c | |
parent | rebase -i: support --root without --onto (diff) | |
download | tgif-b64b7feb730b7a23c7a473a484ba6e68d410c990.tar.xz |
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>
Diffstat (limited to 'test-chmtime.c')
0 files changed, 0 insertions, 0 deletions