t4214: explicitly list tags in log
In a future test case, we will be extending the commit graph. As a result, explicitly list the tags that will generate the graph so that when future additions are made, the current graph illustrations won't be affected. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Oct 3, 2019 at 17:23 UTC
25eb905e14eb3dd72e3208735efd2aa0ef90c550
1 file changed
+4
-4
t/t4214-log-graph-octopus.sh
+4
-4
@@ -33,7 +33,7 @@ test_expect_success 'log --graph with tricky octopus merge, no color' '
33
|/
34
* initial
35
EOF
36
- git log --color=never --graph --date-order --pretty=tformat:%s --all >actual.raw &&
36
+ git log --color=never --graph --date-order --pretty=tformat:%s left octopus-merge >actual.raw &&
37
sed "s/ *\$//" actual.raw >actual &&
38
test_cmp expect.uncolored actual
39
'
@@ -54,7 +54,7 @@ test_expect_success 'log --graph with tricky octopus merge with colors' '
54
<MAGENTA>|<RESET><MAGENTA>/<RESET>
55
* initial
56
EOF
57
- git log --color=always --graph --date-order --pretty=tformat:%s --all >actual.colors.raw &&
57
+ git log --color=always --graph --date-order --pretty=tformat:%s left octopus-merge >actual.colors.raw &&
58
test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
59
test_cmp expect.colors actual.colors
60
'
@@ -75,7 +75,7 @@ test_expect_success 'log --graph with normal octopus merge, no color' '
75
|/
76
* initial
77
EOF
78
- git log --color=never --graph --date-order --pretty=tformat:%s merge >actual.raw &&
78
+ git log --color=never --graph --date-order --pretty=tformat:%s octopus-merge >actual.raw &&
79
sed "s/ *\$//" actual.raw >actual &&
80
test_cmp expect.uncolored actual
81
'
@@ -94,7 +94,7 @@ test_expect_success 'log --graph with normal octopus merge with colors' '
94
* initial
95
EOF
96
test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
97
- git log --color=always --graph --date-order --pretty=tformat:%s merge >actual.colors.raw &&
97
+ git log --color=always --graph --date-order --pretty=tformat:%s octopus-merge >actual.colors.raw &&
98
test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
99
test_cmp expect.colors actual.colors
100
'