mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
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>
This commit is contained in:
parent
cd69ec8cde
commit
d5d202537f
4
apply.c
4
apply.c
|
@ -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 },
|
||||
|
|
Loading…
Reference in a new issue