mirror of
https://github.com/git/git.git
synced 2024-09-29 08:35:10 +02:00
parse-options: write blank line to correct output stream
When commit 54e6dc7 added translation support to parse-options, an fprintf was mistakenly replaced by a call to putchar(). Let's use fputc instead. Fixes t0040.11, t0040.12, t0040.33, and t1502.8. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
c97ee171a6
commit
1a9bf1e176
@ -599,7 +599,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
|
||||
if (**usagestr)
|
||||
fprintf_ln(outfile, _(" %s"), _(*usagestr));
|
||||
else
|
||||
putchar('\n');
|
||||
fputc('\n', outfile);
|
||||
usagestr++;
|
||||
}
|
||||
|
||||
|
@ -92,8 +92,8 @@ test_expect_success 'OPT_BOOL() is idempotent #2' 'check boolean: 1 -DB'
|
||||
test_expect_success 'OPT_BOOL() negation #1' 'check boolean: 0 -D --no-yes'
|
||||
test_expect_success 'OPT_BOOL() negation #2' 'check boolean: 0 -D --no-no-doubt'
|
||||
|
||||
test_expect_failure 'OPT_BOOL() no negation #1' 'check_unknown_i18n --fear'
|
||||
test_expect_failure 'OPT_BOOL() no negation #2' 'check_unknown_i18n --no-no-fear'
|
||||
test_expect_success 'OPT_BOOL() no negation #1' 'check_unknown_i18n --fear'
|
||||
test_expect_success 'OPT_BOOL() no negation #2' 'check_unknown_i18n --no-no-fear'
|
||||
|
||||
test_expect_success 'OPT_BOOL() positivation' 'check boolean: 0 -D --doubt'
|
||||
|
||||
@ -288,7 +288,7 @@ test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
|
||||
|
||||
>expect
|
||||
|
||||
test_expect_failure 'OPT_CALLBACK() and callback errors work' '
|
||||
test_expect_success 'OPT_CALLBACK() and callback errors work' '
|
||||
test_must_fail test-parse-options --no-length >output 2>output.err &&
|
||||
test_i18ncmp expect output &&
|
||||
test_i18ncmp expect.err output.err
|
||||
|
@ -139,7 +139,7 @@ END_EXPECT
|
||||
test_i18ncmp expect output
|
||||
'
|
||||
|
||||
test_expect_failure 'test --parseopt invalid switch help output' '
|
||||
test_expect_success 'test --parseopt invalid switch help output' '
|
||||
sed -e "s/^|//" >expect <<\END_EXPECT &&
|
||||
|error: unknown option `does-not-exist'\''
|
||||
|usage: some-command [options] <args>...
|
||||
|
Loading…
Reference in New Issue
Block a user