Skip to content

Commit d91ce88

Browse files
szedergitster
authored andcommitted
t6120-describe: correct test repo history graph in comment
At the top of 't6120-describe.sh' an ASCII graph illustrates the repository's history used in this test script. This graph is a bit misleading, because it swapped the second merge commit's first and second parents. When describing/naming a commit it does make a difference which parent is the first and which is the second/Nth, so update this graph to accurately represent that second merge. While at it, move this history graph from the 'test_description' variable to a regular comment. Signed-off-by: SZEDER Gábor <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent da72936 commit d91ce88

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

t/t6120-describe.sh

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
#!/bin/sh
22

3-
test_description='test describe
3+
test_description='test describe'
4+
5+
# o---o-----o----o----o-------o----x
6+
# \ D,R e /
7+
# \---o-------------o-'
8+
# \ B /
9+
# `-o----o----o-'
10+
# A c
11+
#
12+
# First parent of a merge commit is on the same line, second parent below.
413

5-
B
6-
.--------------o----o----o----x
7-
/ / /
8-
o----o----o----o----o----. /
9-
\ A c /
10-
.------------o---o---o
11-
D,R e
12-
'
1314
. ./test-lib.sh
1415

1516
check_describe () {

0 commit comments

Comments
 (0)