kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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

Error message fix.

* jb/parse-options-message-fix:
  parse-options: lose an unnecessary space in an error message
maint
Junio C Hamano 2020-02-12 12:41:37 -08:00
parent 3d2471ba85 395518cf7a
commit db72f8c940
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
parse-options.c
View File

@ -419,7 +419,7 @@ static void check_typos(const char *arg, const struct option *options)
return; return;


if (starts_with(arg, "no-")) { 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); exit(129);
} }


@ -427,7 +427,7 @@ static void check_typos(const char *arg, const struct option *options)
if (!options->long_name) if (!options->long_name)
continue; continue;
if (starts_with(options->long_name, arg)) { 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); exit(129);
} }
} }

4
t/t0040-parse-options.sh
View File

@ -242,7 +242,7 @@ test_expect_success 'Alias options do not contribute to abbreviation' '
' '


cat >typo.err <<\EOF cat >typo.err <<\EOF
error: did you mean `--boolean` (with two dashes ?) error: did you mean `--boolean` (with two dashes)?
EOF EOF


test_expect_success 'detect possible typos' ' test_expect_success 'detect possible typos' '
@ -252,7 +252,7 @@ test_expect_success 'detect possible typos' '
' '


cat >typo.err <<\EOF cat >typo.err <<\EOF
error: did you mean `--ambiguous` (with two dashes ?) error: did you mean `--ambiguous` (with two dashes)?
EOF EOF


test_expect_success 'detect possible typos' ' test_expect_success 'detect possible typos' '