#!/bin/sh test_description='git log --graph of skewed left octopus merge.' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh . "$TEST_DIRECTORY"/lib-log-graph.sh test_cmp_graph () { cat >expect && lib_test_cmp_graph --color=never --date-order --format=%s "$@" } test_cmp_colored_graph () { lib_test_cmp_colored_graph --date-order --format=%s "$@" } test_expect_success 'set up merge history' ' test_commit initial && for i in 1 2 3 4 ; do git checkout main -b $i || return $? # Make tag name different from branch name, to avoid # ambiguity error when calling checkout. test_commit $i $i $i tag$i || return $? done && git checkout 1 -b merge && test_merge octopus-merge 1 2 3 4 && test_commit after-merge && git checkout 1 -b L && test_commit left && git checkout 4 -b crossover && test_commit after-4 && git checkout initial -b more-L && test_commit after-initial ' test_expect_success 'log --graph with tricky octopus merge, no color' ' test_cmp_graph left octopus-merge <<-\EOF * left | *-. octopus-merge |/|\ \ | | | * 4 | | * | 3 | | |/ | * / 2 | |/ * / 1 |/ * initial EOF ' test_expect_success 'log --graph with tricky octopus merge with colors' ' test_config log.graphColors red,green,yellow,blue,magenta,cyan && cat >expect.colors <<-\EOF && * left | *-. octopus-merge |/|\ \ | | | * 4 | | * | 3 | | |/ | * / 2 | |/ * / 1 |/ * initial EOF test_cmp_colored_graph left octopus-merge ' # Repeat the previous two tests with "normal" octopus merge (i.e., # without the first parent skewing to the "left" branch column). test_expect_success 'log --graph with normal octopus merge, no color' ' test_cmp_graph octopus-merge <<-\EOF *---. octopus-merge |\ \ \ | | | * 4 | | * | 3 | | |/ | * / 2 | |/ * / 1 |/ * initial EOF ' test_expect_success 'log --graph with normal octopus merge with colors' ' cat >expect.colors <<-\EOF && *---. octopus-merge |\ \ \ | | | * 4 | | * | 3 | | |/ | * / 2 | |/ * / 1 |/ * initial EOF test_config log.graphColors red,green,yellow,blue,magenta,cyan && test_cmp_colored_graph octopus-merge ' test_expect_success 'log --graph with normal octopus merge and child, no color' ' test_cmp_graph after-merge <<-\EOF * after-merge *---. octopus-merge |\ \ \ | | | * 4 | | * | 3 | | |/ | * / 2 | |/ * / 1 |/ * initial EOF ' test_expect_success 'log --graph with normal octopus and child merge with colors' ' cat >expect.colors <<-\EOF && * after-merge *---. octopus-merge |\ \ \ | | | * 4 | | * | 3 | | |/ | * / 2 | |/ * / 1 |/ * initial EOF test_config log.graphColors red,green,yellow,blue,magenta,cyan && test_cmp_colored_graph after-merge ' test_expect_success 'log --graph with tricky octopus merge and its child, no color' ' test_cmp_graph left after-merge <<-\EOF * left | * after-merge | *-. octopus-merge |/|\ \ | | | * 4 | | * | 3 | | |/ | * / 2 | |/ * / 1 |/ * initial EOF ' test_expect_success 'log --graph with tricky octopus merge and its child with colors' ' test_config log.graphColors red,green,yellow,blue,magenta,cyan && cat >expect.colors <<-\EOF && * left | * after-merge | *-. octopus-merge |/|\ \ | | | * 4 | | * | 3 | | |/ | * / 2 | |/ * / 1 |/ * initial EOF test_cmp_colored_graph left after-merge ' test_expect_success 'log --graph with crossover in octopus merge, no color' ' test_cmp_graph after-4 octopus-merge <<-\EOF * after-4 | *---. octopus-merge | |\ \ \ | |_|_|/ |/| | | * | | | 4 | | | * 3 | |_|/ |/| | | | * 2 | |/ |/| | * 1 |/ * initial EOF ' test_expect_success 'log --graph with crossover in octopus merge with colors' ' test_config log.graphColors red,green,yellow,blue,magenta,cyan && cat >expect.colors <<-\EOF && * after-4 | *---. octopus-merge | |\ \ \ | |_|_|/ |/| | | * | | | 4 | | | * 3 | |_|/ |/| | | | * 2 | |/ |/| | * 1 |/ * initial EOF test_cmp_colored_graph after-4 octopus-merge ' test_expect_success 'log --graph with crossover in octopus merge and its child, no color' ' test_cmp_graph after-4 after-merge <<-\EOF * after-4 | * after-merge | *---. octopus-merge | |\ \ \ | |_|_|/ |/| | | * | | | 4 | | | * 3 | |_|/ |/| | | | * 2 | |/ |/| | * 1 |/ * initial EOF ' test_expect_success 'log --graph with crossover in octopus merge and its child with colors' ' test_config log.graphColors red,green,yellow,blue,magenta,cyan && cat >expect.colors <<-\EOF && * after-4 | * after-merge | *---. octopus-merge | |\ \ \ | |_|_|/ |/| | | * | | | 4 | | | * 3 | |_|/ |/| | | | * 2 | |/ |/| | * 1