Browse Source

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 <git@drmicha.warpmail.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael J Gruber 16 years ago committed by Junio C Hamano
parent
commit
30ca4ca7b2
  1. 12
      t/t6010-merge-base.sh

12
t/t6010-merge-base.sh

@ -110,6 +110,18 @@ test_expect_success 'compute merge-base (all)' \ @@ -110,6 +110,18 @@ test_expect_success 'compute merge-base (all)' \

# Another set to demonstrate base between one commit and a merge
# in the documentation.
#
# * C (MMC) * B (MMB) * A (MMA)
# * o * o * o
# * o * o * o
# * o * o * o
# * o | _______/
# | |/
# | * 1 (MM1)
# | _______/
# |/
# * root (MMR)


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

Loading…
Cancel
Save