undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

diff: use add_diff_options() in diff_opt_parse()

Browse Source 
Prepare the removal of the parseopts member of struct diff_options by
using the API function add_diff_options() instead of accessing it
directly to get the command line option definitions.  Building the copy
by concatenating with an empty option array is slightly awkward, but
simpler than a non-concat version of add_diff_options() would be to use
in places that need concatenation.

Suggested-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
René Scharfe 2022-12-01 23:51:21 +01:00 committed by Junio C Hamano
parent c5630c4868
commit 6c6048fa7f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -5680,15 +5680,19 @@ static void prep_parse_options(struct diff_options *options)
int diff_opt_parse(struct diff_options *options, int diff_opt_parse(struct diff_options *options,
const char **av, int ac, const char *prefix) const char **av, int ac, const char *prefix)
{ {
struct option no_options[] = { OPT_END() };
struct option *parseopts = add_diff_options(no_options, options);
if (!prefix) if (!prefix)
prefix = ""; prefix = "";
ac = parse_options(ac, av, prefix, options->parseopts, NULL, ac = parse_options(ac, av, prefix, parseopts, NULL,
PARSE_OPT_KEEP_DASHDASH | PARSE_OPT_KEEP_DASHDASH |
PARSE_OPT_KEEP_UNKNOWN_OPT | PARSE_OPT_KEEP_UNKNOWN_OPT |
PARSE_OPT_NO_INTERNAL_HELP | PARSE_OPT_NO_INTERNAL_HELP |
PARSE_OPT_ONE_SHOT | PARSE_OPT_ONE_SHOT |
PARSE_OPT_STOP_AT_NON_OPTION); PARSE_OPT_STOP_AT_NON_OPTION);
free(parseopts);
return ac; return ac;
} }