path: root/parse-options.c
diff options
authorRené Scharfe <>2009-03-09 20:57:38 (GMT)
committerJunio C Hamano <>2009-03-09 22:32:50 (GMT)
commit0d260f9a09a2febeb86fdada7224d271a76d2e3c (patch)
treefc941df4ea65bc64faf78bfe93a877554a72dccd /parse-options.c
parent9ad7e6ea24739c298d0a9660121de6df0502915a (diff)
parseopt: prevent KEEP_UNKNOWN and STOP_AT_NON_OPTION from being used together
As suggested by Junio, disallow the flags PARSE_OPT_KEEP_UNKNOWN and PARSE_OPT_STOP_AT_NON_OPTION to be turned on at the same time, as a value of an unknown option could be mistakenly classified as a non-option, stopping the parser early. E.g.: git cmd --known --unknown value arg0 arg1 The parser should have stopped at "arg0", but it already stops at "value". This patch makes parse_options() die if the two flags are used in combination. Signed-off-by: Rene Scharfe <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'parse-options.c')
1 files changed, 3 insertions, 0 deletions
diff --git a/parse-options.c b/parse-options.c
index 51e804b..cf71bcf 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -244,6 +244,9 @@ void parse_options_start(struct parse_opt_ctx_t *ctx,
ctx->out = argv;
ctx->cpidx = ((flags & PARSE_OPT_KEEP_ARGV0) != 0);
ctx->flags = flags;
+ if ((flags & PARSE_OPT_KEEP_UNKNOWN) &&
+ die("STOP_AT_NON_OPTION and KEEP_UNKNOWN don't go together");
static int usage_with_options_internal(const char * const *,