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>
Brandon Casey committed
Sep 24, 2017 at 21:08 UTC
1a9bf1e176439d415b97fb8c5a556f69ea503877
3 files changed
+5
-5
parse-options.c
+1
-1
@@ -599,7 +599,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx,
599
if (**usagestr)
600
fprintf_ln(outfile, _(" %s"), _(*usagestr));
601
else
602
- putchar('\n');
602
+ fputc('\n', outfile);
603
usagestr++;
604
}
605
t/t0040-parse-options.sh
+3
-3
@@ -92,8 +92,8 @@ test_expect_success 'OPT_BOOL() is idempotent #2' 'check boolean: 1 -DB'
92
test_expect_success 'OPT_BOOL() negation #1' 'check boolean: 0 -D --no-yes'
93
test_expect_success 'OPT_BOOL() negation #2' 'check boolean: 0 -D --no-no-doubt'
94
95
-test_expect_failure 'OPT_BOOL() no negation #1' 'check_unknown_i18n --fear'
96
-test_expect_failure 'OPT_BOOL() no negation #2' 'check_unknown_i18n --no-no-fear'
95
+test_expect_success 'OPT_BOOL() no negation #1' 'check_unknown_i18n --fear'
96
+test_expect_success 'OPT_BOOL() no negation #2' 'check_unknown_i18n --no-no-fear'
97
98
test_expect_success 'OPT_BOOL() positivation' 'check boolean: 0 -D --doubt'
99
@@ -288,7 +288,7 @@ test_expect_success 'OPT_CALLBACK() and OPT_BIT() work' '
288
289
>expect
290
291
-test_expect_failure 'OPT_CALLBACK() and callback errors work' '
291
+test_expect_success 'OPT_CALLBACK() and callback errors work' '
292
test_must_fail test-parse-options --no-length >output 2>output.err &&
293
test_i18ncmp expect output &&
294
test_i18ncmp expect.err output.err
t/t1502-rev-parse-parseopt.sh
+1
-1
@@ -139,7 +139,7 @@ END_EXPECT
139
test_i18ncmp expect output
140
'
141
142
-test_expect_failure 'test --parseopt invalid switch help output' '
142
+test_expect_success 'test --parseopt invalid switch help output' '
143
sed -e "s/^|//" >expect <<\END_EXPECT &&
144
|error: unknown option `does-not-exist'\''
145
|usage: some-command [options] <args>...