graph: drop assert() for merge with two collapsing parents

[thirdparty/git.git] / t / t4215-log-skewed-merges.sh

diff --git a/t/t4215-log-skewed-merges.sh b/t/t4215-log-skewed-merges.sh
index 18709a723e56dc9c61a61f3f7ab52dd866832f59..ddf6f6f5d3db1745a17cff614de6efa30952c378 100755 (executable)
--- a/t/t4215-log-skewed-merges.sh
+++ b/t/t4215-log-skewed-merges.sh
@@ -240,4 +240,46 @@ test_expect_success 'log --graph with octopus merge with column joining its penu
        EOF
 '
 
+test_expect_success 'log --graph with multiple tips' '
+       git checkout --orphan 6_1 &&
+       test_commit 6_A &&
+       git branch 6_2 &&
+       git branch 6_4 &&
+       test_commit 6_B &&
+       git branch 6_3 &&
+       test_commit 6_C &&
+       git checkout 6_2 && test_commit 6_D &&
+       git checkout 6_3 && test_commit 6_E &&
+       git checkout -b 6_5 6_1 &&
+       git merge --no-ff 6_2 -m 6_F &&
+       git checkout 6_4 && test_commit 6_G &&
+       git checkout 6_3 &&
+       git merge --no-ff 6_4 -m 6_H &&
+       git checkout 6_1 &&
+       git merge --no-ff 6_2 -m 6_I &&
+
+       check_graph 6_1 6_3 6_5 <<-\EOF
+       *   6_I
+       |\
+       | | *   6_H
+       | | |\
+       | | | * 6_G
+       | | * | 6_E
+       | | | | * 6_F
+       | |_|_|/|
+       |/| | |/
+       | | |/|
+       | |/| |
+       | * | | 6_D
+       | | |/
+       | |/|
+       * | | 6_C
+       | |/
+       |/|
+       * | 6_B
+       |/
+       * 6_A
+       EOF
+'
+
 test_done