Merge branch 'jb/parse-options-message-fix'

gitster · gitster · commit db72f8c940b3 · 2020-02-12T12:41:37.000-08:00
Error message fix.

* jb/parse-options-message-fix:
  parse-options: lose an unnecessary space in an error message
diff --git a/parse-options.c b/parse-options.c
@@ -419,15 +419,15 @@ static void check_typos(const char *arg, const struct option *options)
 		return;
 
 	if (starts_with(arg, "no-")) {
-		error(_("did you mean `--%s` (with two dashes ?)"), arg);
+		error(_("did you mean `--%s` (with two dashes)?"), arg);
 		exit(129);
 	}
 
 	for (; options->type != OPTION_END; options++) {
 		if (!options->long_name)
 			continue;
 		if (starts_with(options->long_name, arg)) {
-			error(_("did you mean `--%s` (with two dashes ?)"), arg);
+			error(_("did you mean `--%s` (with two dashes)?"), arg);
 			exit(129);
 		}
 	}
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
@@ -242,7 +242,7 @@ test_expect_success 'Alias options do not contribute to abbreviation' '
 '
 
 cat >typo.err <<\EOF
-error: did you mean `--boolean` (with two dashes ?)
+error: did you mean `--boolean` (with two dashes)?
 EOF
 
 test_expect_success 'detect possible typos' '
@@ -252,7 +252,7 @@ test_expect_success 'detect possible typos' '
 '
 
 cat >typo.err <<\EOF
-error: did you mean `--ambiguous` (with two dashes ?)
+error: did you mean `--ambiguous` (with two dashes)?
 EOF
 
 test_expect_success 'detect possible typos' '

Original file line number	Diff line number	Diff line change
`@@ -419,15 +419,15 @@ static void check_typos(const char arg, const struct option options)`
`419`	`419`	`return;`
`420`	`420`
`421`	`421`	`if (starts_with(arg, "no-")) {`
`422`		- error(_("did you mean `--%s` (with two dashes ?)"), arg);
	`422`	+ error(_("did you mean `--%s` (with two dashes)?"), arg);
`423`	`423`	`exit(129);`
`424`	`424`	`}`
`425`	`425`
`426`	`426`	`for (; options->type != OPTION_END; options++) {`
`427`	`427`	`if (!options->long_name)`
`428`	`428`	`continue;`
`429`	`429`	`if (starts_with(options->long_name, arg)) {`
`430`		- error(_("did you mean `--%s` (with two dashes ?)"), arg);
	`430`	+ error(_("did you mean `--%s` (with two dashes)?"), arg);
`431`	`431`	`exit(129);`
`432`	`432`	`}`
`433`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ test_expect_success 'Alias options do not contribute to abbreviation' '`
`242`	`242`	`'`
`243`	`243`
`244`	`244`	`cat >typo.err <<\EOF`
`245`		-error: did you mean `--boolean` (with two dashes ?)
	`245`	+error: did you mean `--boolean` (with two dashes)?
`246`	`246`	`EOF`
`247`	`247`
`248`	`248`	`test_expect_success 'detect possible typos' '`
`@@ -252,7 +252,7 @@ test_expect_success 'detect possible typos' '`
`252`	`252`	`'`
`253`	`253`
`254`	`254`	`cat >typo.err <<\EOF`
`255`		-error: did you mean `--ambiguous` (with two dashes ?)
	`255`	+error: did you mean `--ambiguous` (with two dashes)?
`256`	`256`	`EOF`
`257`	`257`
`258`	`258`	`test_expect_success 'detect possible typos' '`