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

gitster · gitster · commit 6f0c33666300 · 2013-02-27T10:04:26.000-08:00
* ef/non-ascii-parse-options-error-diag:
  parse-options: report uncorrupted multi-byte options
diff --git 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);
 	}

Original file line number	Diff line number	Diff line change
`@@ -471,8 +471,11 @@ int parse_options(int argc, const char *argv, const char prefix,`
`471`	`471`	`default: /* PARSE_OPT_UNKNOWN */`
`472`	`472`	`if (ctx.argv[0][1] == '-') {`
`473`	`473`	error("unknown option `%s'", ctx.argv[0] + 2);
`474`		`- } else {`
	`474`	`+ } else if (isascii(*ctx.opt)) {`
`475`	`475`	error("unknown switch `%c'", *ctx.opt);
	`476`	`+ } else {`
	`477`	+ error("unknown non-ascii option in string: `%s'",
	`478`	`+ ctx.argv[0]);`
`476`	`479`	`}`
`477`	`480`	`usage_with_options(usagestr, options);`
`478`	`481`	`}`