diff options
| author |  Jeff King <peff@peff.net> | 2018-11-05 01:38:19 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-06 12:55:35 +0900 |
| commit | d5d202537f2cfec41304b559624b4cc0a2d8c9fe (patch) | |
| tree | 2572174be4ac08e3fc43e436e30b291df8fc7689 | |
| parent | Merge branch 'jc/http-curlver-warnings' (diff) | |
| download | tgif-d5d202537f2cfec41304b559624b4cc0a2d8c9fe.tar.xz | |
apply: mark include/exclude options as NONEG
The options callback for "git apply --no-include" is not ready to handle
the "unset" parameter, and as a result will segfault when it adds a NULL
argument to the include list (likewise for "--no-exclude").
In theory this might be used to clear the list, but since both
"--include" and "--exclude" add to the same list, it's not immediately
obvious what the semantics should be. Let's punt on that for now and
just disallow the broken options.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | apply.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -4939,10 +4939,10 @@ int apply_parse_options(int argc, const char **argv, struct option builtin_apply_options[] = { { OPTION_CALLBACK, 0, "exclude", state, N_("path"), N_("don't apply changes matching the given path"), - 0, apply_option_parse_exclude }, + PARSE_OPT_NONEG, apply_option_parse_exclude }, { OPTION_CALLBACK, 0, "include", state, N_("path"), N_("apply changes matching the given path"), - 0, apply_option_parse_include }, + PARSE_OPT_NONEG, apply_option_parse_include }, { OPTION_CALLBACK, 'p', NULL, state, N_("num"), N_("remove <num> leading slashes from traditional diff paths"), 0, apply_option_parse_p }, |