receive-pack: explain what to do when push updates the current branch

diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 6359580262e9a171e46c60749b1827324e6535f9..9fc528fdea18409fa2871f62ec3b14577b1a55e4 100755 (executable)
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -7,23 +7,13 @@ Tests if git rebase --root --onto <newparent> 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 &&
+       test_commit 1 A &&
+       test_commit 2 A &&
        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_commit 3 B &&
+       test_commit 1b A 1 &&
+       test_commit 4 B
 '
 
 test_expect_success 'rebase --root expects --onto' '
@@ -103,9 +93,7 @@ test_expect_success 'pre-rebase got correct input (5)' '
 test_expect_success 'set up merge history' '
        git checkout other^ &&
        git checkout -b side &&
-       echo 5 > C &&
-       git add C &&
-       git commit -m 5 &&
+       test_commit 5 C &&
        git checkout other &&
        git merge side
 '
@@ -132,9 +120,7 @@ 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 &&
+       test_commit 6 D &&
        git checkout other &&
        git merge third
 '
@@ -172,16 +158,126 @@ EOF
 
 test_expect_success 'pre-rebase hook stops rebase' '
        git checkout -b stops1 other &&
-       GIT_EDITOR=: test_must_fail git rebase --root --onto master &&
+       (
+               GIT_EDITOR=:
+               export GIT_EDITOR
+               test_must_fail git rebase --root --onto master
+       ) &&
        test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1
        test 0 = $(git rev-list other...stops1 | wc -l)
 '
 
 test_expect_success 'pre-rebase hook stops rebase -i' '
        git checkout -b stops2 other &&
-       GIT_EDITOR=: test_must_fail git rebase --root --onto master &&
+       (
+               GIT_EDITOR=:
+               export GIT_EDITOR
+               test_must_fail git rebase --root --onto master
+       ) &&
        test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2
        test 0 = $(git rev-list other...stops2 | wc -l)
 '
 
+test_expect_success 'remove pre-rebase hook' '
+       rm -f .git/hooks/pre-rebase
+'
+
+test_expect_success 'set up a conflict' '
+       git checkout master &&
+       echo conflict > 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 <<EOF
+6
+5
+4
+3
+conflict
+2
+1
+EOF
+
+test_expect_success 'rebase --root with conflict (second part)' '
+       git rebase --continue &&
+       git log --pretty=tformat:"%s" > 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