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>
Allan Caffee committed
Apr 22, 2009 at 17:27 UTC
7b1d6269eebb0701c287d3ed8732384c115d2e1f
1 file changed
+28
-2
t/t4202-log.sh
+28
-2
@@ -284,10 +284,36 @@ test_expect_success 'set up more tangled history' '
284
git merge master~3 &&
285
git merge side~1 &&
286
git checkout master &&
287
- git merge tangle
287
+ git merge tangle &&
288
+ git checkout -b reach &&
289
+ test_commit reach &&
290
+ git checkout master &&
291
+ git checkout -b octopus-a &&
292
+ test_commit octopus-a &&
293
+ git checkout master &&
294
+ git checkout -b octopus-b &&
295
+ test_commit octopus-b &&
296
+ git checkout master &&
297
+ test_commit seventh &&
298
+ git merge octopus-a octopus-b
299
+ git merge reach
300
'
301
302
cat > expect <<\EOF
303
+* Merge branch 'reach'
304
+|\
305
+| \
306
+| \
307
+*-. \ Merge branches 'octopus-a' and 'octopus-b'
308
+|\ \ \
309
+* | | | seventh
310
+| | * | octopus-b
311
+| |/ /
312
+|/| |
313
+| * | octopus-a
314
+|/ /
315
+| * reach
316
+|/
317
* Merge branch 'tangle'
318
|\
319
| * Merge branch 'side' (early part) into tangle
@@ -316,7 +342,7 @@ cat > expect <<\EOF
342
* initial
343
EOF
344
319
-test_expect_success 'log --graph with merge' '
345
+test_expect_failure 'log --graph with merge' '
346
git log --graph --date-order --pretty=tformat:%s |
347
sed "s/ *$//" >actual &&
348
test_cmp expect actual