diff options
| author | Brandon Casey <drafnel@gmail.com> | 2017-09-24 21:08:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-25 14:35:52 +0900 |
| commit | 1a9bf1e176439d415b97fb8c5a556f69ea503877 (patch) | |
| tree | 07681bd8a63f0e2c81a319d6d32b35493512b0ce | |
| parent | c97ee171a6b5a7e41234d46341b496146fa08bf1 (diff) | |
| download | git-1a9bf1e176439d415b97fb8c5a556f69ea503877.tar.gz git-1a9bf1e176439d415b97fb8c5a556f69ea503877.tar.xz | |
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>
| -rw-r--r-- | parse-options.c | 2 | ||||
| -rwxr-xr-x | t/t0040-parse-options.sh | 6 | ||||
| -rwxr-xr-x | t/t1502-rev-parse-parseopt.sh | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/parse-options.c b/parse-options.c index 0dd9fc6a0..6a03a5269 100644 --- a/parse-options.c +++ b/parse-options.c @@ -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++; } diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index a36434bd1..0c2fc81d7 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -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 diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh index 1bfa80f8a..ce7dda1ee 100755 --- a/t/t1502-rev-parse-parseopt.sh +++ b/t/t1502-rev-parse-parseopt.sh @@ -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>... |