diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-02-27 18:04:26 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-27 18:04:26 (GMT) |
| commit | 6f0c33666300ccf95eb4b4e723e07a3c588d12db (patch) | |
| tree | a70a955112a0fbaa9aac9956a2521259ee4f7b0c /parse-options.c | |
| parent | 28db11169b53695827b180e4ee11c33bf2ec116a (diff) | |
| parent | b141a47801d6fb2d68ec48adfe7597ec3ce49c0d (diff) | |
| download | git-6f0c33666300ccf95eb4b4e723e07a3c588d12db.zip git-6f0c33666300ccf95eb4b4e723e07a3c588d12db.tar.gz git-6f0c33666300ccf95eb4b4e723e07a3c588d12db.tar.bz2 | |
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
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/parse-options.c b/parse-options.c index 670bf09..7ca8f2c 100644 --- a/parse-options.c +++ b/parse-options.c @@ -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); } |