Skip to content

Commit 25eb905

Browse files
Denton-Lgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 63be8c8 commit 25eb905

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

t/t4214-log-graph-octopus.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ test_expect_success 'log --graph with tricky octopus merge, no color' '
3333
|/
3434
* initial
3535
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 &&
3737
sed "s/ *\$//" actual.raw >actual &&
3838
test_cmp expect.uncolored actual
3939
'
@@ -54,7 +54,7 @@ test_expect_success 'log --graph with tricky octopus merge with colors' '
5454
<MAGENTA>|<RESET><MAGENTA>/<RESET>
5555
* initial
5656
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 &&
5858
test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
5959
test_cmp expect.colors actual.colors
6060
'
@@ -75,7 +75,7 @@ test_expect_success 'log --graph with normal octopus merge, no color' '
7575
|/
7676
* initial
7777
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 &&
7979
sed "s/ *\$//" actual.raw >actual &&
8080
test_cmp expect.uncolored actual
8181
'
@@ -94,7 +94,7 @@ test_expect_success 'log --graph with normal octopus merge with colors' '
9494
* initial
9595
EOF
9696
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 &&
9898
test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
9999
test_cmp expect.colors actual.colors
100100
'

0 commit comments

Comments
 (0)