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

Merge branch 'ef/non-ascii-parse-options-error-diag' into maint 

* ef/non-ascii-parse-options-error-diag:
  parse-options: report uncorrupted multi-byte options
maint
Junio C Hamano 2013-02-27 10:04:26 -08:00
parent 28db11169b b141a47801
commit 6f0c336663
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
parse-options.c
View File

@ -471,8 +471,11 @@ int parse_options(int argc, const char **argv, const char *prefix,
default: /* PARSE_OPT_UNKNOWN */
if (ctx.argv[0][1] == '-') {
error("unknown option `%s'", ctx.argv[0] + 2);
} else {
} else if (isascii(*ctx.opt)) {
error("unknown switch `%c'", *ctx.opt);
} else {
error("unknown non-ascii option in string: `%s'",
ctx.argv[0]);
}
usage_with_options(usagestr, options);
}