From b64b7feb730b7a23c7a473a484ba6e68d410c990 Mon Sep 17 00:00:00 2001 From: Chris Webb Date: Tue, 26 Jun 2012 22:55:24 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- t/t3412-rebase-root.sh | 4 ---- 1 file changed, 4 deletions(-) (limited to 't/t3412-rebase-root.sh') diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh index 086c91c7b4..e4f9da8536 100755 --- a/t/t3412-rebase-root.sh +++ b/t/t3412-rebase-root.sh @@ -22,10 +22,6 @@ test_expect_success 'prepare repository' ' test_commit 4 B ' -test_expect_success 'rebase --root expects --onto' ' - test_must_fail git rebase --root -' - test_expect_success 'setup pre-rebase hook' ' mkdir -p .git/hooks && cat >.git/hooks/pre-rebase <