diff options
| author | Allan Caffee <allan.caffee@gmail.com> | 2009-04-22 17:27:15 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-04-22 17:48:22 -0700 |
| commit | 7b1d6269eebb0701c287d3ed8732384c115d2e1f (patch) | |
| tree | 517d2cc6a28c6f439effac47191180a634bdff61 /t/t4202-log.sh | |
| parent | 8fbf879ed75b67417b0e36eb7b03b79611f1f8a0 (diff) | |
| download | git-7b1d6269eebb0701c287d3ed8732384c115d2e1f.tar.gz | |
t4202-log: extend test coverage of graphing
Extend this test to cover the rendering of graphs with octopus merges
and pre_commit lines.
Signed-off-by: Allan Caffee <allan.caffee@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index b98619035c..46bd24f502 100755 --- 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 @@ -316,7 +342,7 @@ cat > expect <<\EOF * initial EOF -test_expect_success 'log --graph with merge' ' +test_expect_failure 'log --graph with merge' ' git log --graph --date-order --pretty=tformat:%s | sed "s/ *$//" >actual && test_cmp expect actual |