aboutsummaryrefslogtreecommitdiff
path: root/t/t3412-rebase-root.sh
diff options
context:
space:
mode:
authorChris Webb <chris@arachsys.com>2012-06-26 22:55:24 +0100
committerJunio C Hamano <gitster@pobox.com>2012-06-26 15:09:29 -0700
commitb64b7feb730b7a23c7a473a484ba6e68d410c990 (patch)
tree4b758a43cadcb94d0afe52f84086d6222519b8df /t/t3412-rebase-root.sh
parentdf5df20c1308f936ea542c86df1e9c6974168472 (diff)
downloadgit-b64b7feb730b7a23c7a473a484ba6e68d410c990.tar.gz
git-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 't/t3412-rebase-root.sh')
-rwxr-xr-xt/t3412-rebase-root.sh4
1 files changed, 0 insertions, 4 deletions
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 086c91c7b..e4f9da853 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 <<EOF &&