Re: [PATCH v2 00/13] Fixes to trailer test script, help text, and documentation
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 11, 2023, 01:41 UTC
- Message-ID
- <xmqq7cq2pd7o.fsf@gitster.g>
- In-Reply-To
- <pull.1564.v2.git.1691702283.gitgitgadget@gmail.com>
t0450 dies like the attached, probably because the documentation was updated to say "<key> or <keyAlias>" but a matching update to the output of "interpret-trailers -h" command help is missing?
A possible trivial fix to 13/13 will be queued on top as "SQUASH???" patch for now.
builtin/interpret-trailers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git c/builtin/interpret-trailers.c w/builtin/interpret-trailers.c index 832f86a770..d2d78fd961 100644 --- c/builtin/interpret-trailers.c +++ w/builtin/interpret-trailers.c @@ -14,7 +14,7 @@ static const char * const git_interpret_trailers_usage[] = { N_("git interpret-trailers [--in-place] [--trim-empty]\n" - " [(--trailer <token>[(=|:)<value>])...]\n" + " [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...]\n" " [--parse] [<file>...]"), NULL }; --- txt 2023-08-10 22:31:54.328609532 +0000 +++ help 2023-08-10 22:31:54.332609929 +0000 @@ -1,3 +1,3 @@ git interpret-trailers [--in-place] [--trim-empty] - [(--trailer (<key>|<keyAlias>)[(=|:)<value>])...] + [(--trailer <token>[(=|:)<value>])...] [--parse] [<file>...] not ok 302 - interpret-trailers -h output and SYNOPSIS agree # # t2s="$(txt_to_synopsis "$builtin")" && # if test "$builtin" = "merge-tree" # then # test_when_finished "rm -f t2s.new" && # sed -e 's/ (deprecated)$//g' <"$t2s" >t2s.new # t2s=t2s.new # fi && # h2s="$(help_to_synopsis "$builtin")" && # # # The *.txt and -h use different spacing for the # # alignment of continued usage output, normalize it. # align_after_nl "$builtin" <"$t2s" >txt && # align_after_nl "$builtin" <"$h2s" >help && # test_cmp txt help # 1