Merge branch 'jn/update-contrib-example-merge'

diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 9fc528fdea18409fa2871f62ec3b14577b1a55e4..5869061c5bfdee4a84b156b8ec9d6e331a2c906c 100755 (executable)
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -6,6 +6,12 @@ Tests if git rebase --root --onto <newparent> can rebase the root commit.
 '
 . ./test-lib.sh
 
+log_with_names () {
+       git rev-list --topo-order --parents --pretty="tformat:%s" HEAD |
+       git name-rev --stdin --name-only --refs=refs/heads/$1
+}
+
+
 test_expect_success 'prepare repository' '
        test_commit 1 A &&
        test_commit 2 A &&
@@ -59,7 +65,7 @@ test_expect_success 'pre-rebase got correct input (2)' '
 
 test_expect_success 'rebase -i --root --onto <newbase>' '
        git checkout -b work3 other &&
-       GIT_EDITOR=: git rebase -i --root --onto master &&
+       git rebase -i --root --onto master &&
        git log --pretty=tformat:"%s" > rebased3 &&
        test_cmp expect rebased3
 '
@@ -70,7 +76,7 @@ test_expect_success 'pre-rebase got correct input (3)' '
 
 test_expect_success 'rebase -i --root --onto <newbase> <branch>' '
        git branch work4 other &&
-       GIT_EDITOR=: git rebase -i --root --onto master work4 &&
+       git rebase -i --root --onto master work4 &&
        git log --pretty=tformat:"%s" > rebased4 &&
        test_cmp expect rebased4
 '
@@ -81,7 +87,7 @@ test_expect_success 'pre-rebase got correct input (4)' '
 
 test_expect_success 'rebase -i -p with linear history' '
        git checkout -b work5 other &&
-       GIT_EDITOR=: git rebase -i -p --root --onto master &&
+       git rebase -i -p --root --onto master &&
        git log --pretty=tformat:"%s" > rebased5 &&
        test_cmp expect rebased5
 '
@@ -98,21 +104,25 @@ test_expect_success 'set up merge history' '
        git merge side
 '
 
-sed 's/#/ /g' > expect-side <<'EOF'
-*   Merge branch 'side' into other
-|\##
-| * 5
-* | 4
-|/##
-* 3
-* 2
-* 1
+cat > expect-side <<'EOF'
+commit work6 work6~1 work6^2
+Merge branch 'side' into other
+commit work6^2 work6~2
+5
+commit work6~1 work6~2
+4
+commit work6~2 work6~3
+3
+commit work6~3 work6~4
+2
+commit work6~4
+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 &&
+       git rebase -i -p --root --onto master &&
+       log_with_names work6 > rebased6 &&
        test_cmp expect-side rebased6
 '
 
@@ -125,25 +135,29 @@ test_expect_success 'set up second root and merge' '
        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
+cat > expect-third <<'EOF'
+commit work7 work7~1 work7^2
+Merge branch 'third' into other
+commit work7^2 work7~4
+6
+commit work7~1 work7~2 work7~1^2
+Merge branch 'side' into other
+commit work7~1^2 work7~3
+5
+commit work7~2 work7~3
+4
+commit work7~3 work7~4
+3
+commit work7~4 work7~5
+2
+commit work7~5
+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 &&
+       git rebase -i -p --root --onto master &&
+       log_with_names work7 > rebased7 &&
        test_cmp expect-third rebased7
 '
 
@@ -158,22 +172,14 @@ EOF
 
 test_expect_success 'pre-rebase hook stops rebase' '
        git checkout -b stops1 other &&
-       (
-               GIT_EDITOR=:
-               export GIT_EDITOR
-               test_must_fail git rebase --root --onto master
-       ) &&
+       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=:
-               export GIT_EDITOR
-               test_must_fail git rebase --root --onto master
-       ) &&
+       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)
 '
@@ -218,11 +224,7 @@ test_expect_success 'rebase --root with conflict (second part)' '
 
 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
-       ) &&
+       test_must_fail git rebase -i --root --onto master &&
        git ls-files -u | grep "B$"
 '
 
@@ -260,11 +262,7 @@ 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
-       ) &&
+       test_must_fail git rebase -i -p --root --onto master &&
        git ls-files -u | grep "B$"
 '
 
@@ -275,8 +273,7 @@ test_expect_success 'fix the conflict' '
 
 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 &&
+       log_with_names conflict3 >out &&
        test_cmp expect-conflict-p out
 '