diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2019-11-12 13:38:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-13 07:13:24 +0300 |
| commit | d91ce887c936affbbf24ab2461d924ad1c6eefc7 (patch) | |
| tree | afd7dc85cff97fe6301e3648643c5dc58beb19db /t/t6120-describe.sh | |
| parent | da72936f544fec5a335e66432610e4cef4430991 (diff) | |
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 <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6120-describe.sh')
| -rwxr-xr-x | t/t6120-describe.sh | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh index 45047d0a72..9b184179d1 100755 --- a/t/t6120-describe.sh +++ b/t/t6120-describe.sh @@ -1,15 +1,16 @@ #!/bin/sh -test_description='test describe +test_description='test describe' + +# o---o-----o----o----o-------o----x +# \ D,R e / +# \---o-------------o-' +# \ B / +# `-o----o----o-' +# A c +# +# First parent of a merge commit is on the same line, second parent below. - B - .--------------o----o----o----x - / / / - o----o----o----o----o----. / - \ A c / - .------------o---o---o - D,R e -' . ./test-lib.sh check_describe () { |