development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-24 18:26:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

t4202-log: extend test coverage of graphing

Browse source 
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>
This commit is contained in:
Allan Caffee 2009-04-22 17:27:15 -04:00 committed by Junio C Hamano
parent 8fbf879ed7
commit 7b1d6269ee
1 changed files with 28 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
t/t4202-log.sh
View file

@ -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