#!/bin/sh test_description='git rebase --root Tests if git rebase --root --onto can rebase the root commit. ' . ./test-lib.sh test_expect_success 'prepare repository' ' echo 1 > A && git add A && git commit -m 1 && echo 2 > A && git add A && git commit -m 2 && git symbolic-ref HEAD refs/heads/other && rm .git/index && echo 3 > B && git add B && git commit -m 3 && echo 1 > A && git add A && git commit -m 1b && echo 4 > B && git add B && git commit -m 4 ' 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 <.git/PRE-REBASE-INPUT EOF chmod +x .git/hooks/pre-rebase ' cat > expect <' ' git checkout -b work && git rebase --root --onto master && git log --pretty=tformat:"%s" > rebased && test_cmp expect rebased ' test_expect_success 'pre-rebase got correct input (1)' ' test "z$(cat .git/PRE-REBASE-INPUT)" = z--root, ' test_expect_success 'rebase --root --onto ' ' git branch work2 other && git rebase --root --onto master work2 && git log --pretty=tformat:"%s" > rebased2 && test_cmp expect rebased2 ' test_expect_success 'pre-rebase got correct input (2)' ' test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work2 ' test_expect_success 'rebase -i --root --onto ' ' git checkout -b work3 other && GIT_EDITOR=: git rebase -i --root --onto master && git log --pretty=tformat:"%s" > rebased3 && test_cmp expect rebased3 ' test_expect_success 'pre-rebase got correct input (3)' ' test "z$(cat .git/PRE-REBASE-INPUT)" = z--root, ' test_expect_success 'rebase -i --root --onto ' ' git branch work4 other && GIT_EDITOR=: git rebase -i --root --onto master work4 && git log --pretty=tformat:"%s" > rebased4 && test_cmp expect rebased4 ' test_expect_success 'pre-rebase got correct input (4)' ' test "z$(cat .git/PRE-REBASE-INPUT)" = z--root,work4 ' test_expect_success 'rebase -i -p with linear history' ' git checkout -b work5 other && GIT_EDITOR=: git rebase -i -p --root --onto master && git log --pretty=tformat:"%s" > rebased5 && test_cmp expect rebased5 ' test_expect_success 'pre-rebase got correct input (5)' ' test "z$(cat .git/PRE-REBASE-INPUT)" = z--root, ' test_expect_success 'set up merge history' ' git checkout other^ && git checkout -b side && echo 5 > C && git add C && git commit -m 5 && git checkout other && git merge side ' sed 's/#/ /g' > expect-side <<'EOF' * Merge branch 'side' into other |\## | * 5 * | 4 |/## * 3 * 2 * 1 EOF test_expect_success 'rebase -i -p with merge' ' git checkout -b work6 other && GIT_EDITOR=: git rebase -i -p --root --onto master && git log --graph --topo-order --pretty=tformat:"%s" > rebased6 && test_cmp expect-side rebased6 ' test_expect_success 'set up second root and merge' ' git symbolic-ref HEAD refs/heads/third && rm .git/index && rm A B C && echo 6 > D && git add D && git commit -m 6 && git checkout other && git merge third ' sed 's/#/ /g' > expect-third <<'EOF' * Merge branch 'third' into other |\## | * 6 * | Merge branch 'side' into other |\ \## | * | 5 * | | 4 |/ /## * | 3 |/## * 2 * 1 EOF test_expect_success 'rebase -i -p with two roots' ' git checkout -b work7 other && GIT_EDITOR=: git rebase -i -p --root --onto master && git log --graph --topo-order --pretty=tformat:"%s" > rebased7 && test_cmp expect-third rebased7 ' test_expect_success 'setup pre-rebase hook that fails' ' mkdir -p .git/hooks && cat >.git/hooks/pre-rebase < B && git add B && git commit -m conflict ' test_expect_success 'rebase --root with conflict (first part)' ' git checkout -b conflict1 other && test_must_fail git rebase --root --onto master && git ls-files -u | grep "B$" ' test_expect_success 'fix the conflict' ' echo 3 > B && git add B ' cat > expect-conflict < conflict1 && test_cmp expect-conflict conflict1 ' test_expect_success 'rebase -i --root with conflict (first part)' ' git checkout -b conflict2 other && ( GIT_EDITOR=: export GIT_EDITOR test_must_fail git rebase -i --root --onto master ) && git ls-files -u | grep "B$" ' test_expect_success 'fix the conflict' ' echo 3 > B && git add B ' test_expect_success 'rebase -i --root with conflict (second part)' ' git rebase --continue && git log --pretty=tformat:"%s" > conflict2 && test_cmp expect-conflict conflict2 ' cat >expect-conflict-p <<\EOF commit conflict3 conflict3~1 conflict3^2 Merge branch 'third' into other commit conflict3^2 conflict3~4 6 commit conflict3~1 conflict3~2 conflict3~1^2 Merge branch 'side' into other commit conflict3~1^2 conflict3~3 5 commit conflict3~2 conflict3~3 4 commit conflict3~3 conflict3~4 3 commit conflict3~4 conflict3~5 conflict commit conflict3~5 conflict3~6 2 commit conflict3~6 1 EOF test_expect_success 'rebase -i -p --root with conflict (first part)' ' git checkout -b conflict3 other && ( GIT_EDITOR=: export GIT_EDITOR test_must_fail git rebase -i -p --root --onto master ) && git ls-files -u | grep "B$" ' test_expect_success 'fix the conflict' ' echo 3 > B && git add B ' test_expect_success 'rebase -i -p --root with conflict (second part)' ' git rebase --continue && git rev-list --topo-order --parents --pretty="tformat:%s" HEAD | git name-rev --stdin --name-only --refs=refs/heads/conflict3 >out && test_cmp expect-conflict-p out ' test_done