t/t3400-rebase.sh: add more tests to help migrating git-rebase.sh to C

[git.git] / t / t4202-log.sh

diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index b98619035c58d1b5c617c6e9998e7ae07ab3f27f..aad3894ad4c542d4ab894c2d57a035a89eb88258 100755 (executable)
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -284,10 +284,36 @@ test_expect_success 'set up more tangled history' '
        git merge master~3 &&
        git merge side~1 &&
        git checkout master &&
-       git merge tangle
+       git merge tangle &&
+       git checkout -b reach &&
+       test_commit reach &&
+       git checkout master &&
+       git checkout -b octopus-a &&
+       test_commit octopus-a &&
+       git checkout master &&
+       git checkout -b octopus-b &&
+       test_commit octopus-b &&
+       git checkout master &&
+       test_commit seventh &&
+       git merge octopus-a octopus-b
+       git merge reach
 '
 
 cat > expect <<\EOF
+*   Merge branch 'reach'
+|\
+| \
+|  \
+*-. \   Merge branches 'octopus-a' and 'octopus-b'
+|\ \ \
+* | | | seventh
+| | * | octopus-b
+| |/ /
+|/| |
+| * | octopus-a
+|/ /
+| * reach
+|/
 *   Merge branch 'tangle'
 |\
 | *   Merge branch 'side' (early part) into tangle
@@ -298,14 +324,12 @@ cat > expect <<\EOF
 * | | |   Merge branch 'side'
 |\ \ \ \
 | * | | | side-2
-| | | |/
-| | |/|
+| | |_|/
 | |/| |
 | * | | side-1
 * | | | Second
 * | | | sixth
-| | |/
-| |/|
+| |_|/
 |/| |
 * | | fifth
 * | | fourth