Skip to content

Commit 30ca4ca

Browse files
Michael J Grubergitster
authored andcommitted
t6010-merge-base.sh: Depict the octopus test graph
...so that it is easier to reuse it for other tests. Signed-off-by: Michael J Gruber <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent b7da721 commit 30ca4ca

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

t/t6010-merge-base.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,18 @@ test_expect_success 'compute merge-base (all)' \
110110

111111
# Another set to demonstrate base between one commit and a merge
112112
# in the documentation.
113+
#
114+
# * C (MMC) * B (MMB) * A (MMA)
115+
# * o * o * o
116+
# * o * o * o
117+
# * o * o * o
118+
# * o | _______/
119+
# | |/
120+
# | * 1 (MM1)
121+
# | _______/
122+
# |/
123+
# * root (MMR)
124+
113125

114126
test_expect_success 'merge-base for octopus-step (setup)' '
115127
test_tick && git commit --allow-empty -m root && git tag MMR &&

0 commit comments

Comments
 (0)