diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-23 20:44:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 20:44:48 (GMT) |
| commit | 0e35107e7dde88a8d53a98773afbbbd23cd694ae (patch) | |
| tree | 87d23d4283a3e80eb79ac62e09067607eeeea17e /parse-options.c | |
| parent | 0a4cb1f1f2f64e5f3791809284ba786a8094dfb4 (diff) | |
| parent | 4c25356e0edaa92e21aadb67579a0263019fbdc4 (diff) | |
| download | git-0e35107e7dde88a8d53a98773afbbbd23cd694ae.zip git-0e35107e7dde88a8d53a98773afbbbd23cd694ae.tar.gz git-0e35107e7dde88a8d53a98773afbbbd23cd694ae.tar.bz2 | |
Merge branch 'ab/retire-option-argument'
An oddball OPTION_ARGUMENT feature has been removed from the
parse-options API.
* ab/retire-option-argument:
parse-options API: remove OPTION_ARGUMENT feature
difftool: use run_command() API in run_file_diff()
difftool: prepare "diff" cmdline in cmd_difftool()
difftool: prepare "struct child_process" in cmd_difftool()
Diffstat (limited to 'parse-options.c')
| -rw-r--r-- | parse-options.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/parse-options.c b/parse-options.c index 2abff13..55c5821 100644 --- a/parse-options.c +++ b/parse-options.c @@ -310,19 +310,6 @@ static enum parse_opt_result parse_long_opt( again: if (!skip_prefix(arg, long_name, &rest)) rest = NULL; - if (options->type == OPTION_ARGUMENT) { - if (!rest) - continue; - if (*rest == '=') - return error(_("%s takes no value"), - optname(options, flags)); - if (*rest) - continue; - if (options->value) - *(int *)options->value = options->defval; - p->out[p->cpidx++] = arg - 2; - return PARSE_OPT_DONE; - } if (!rest) { /* abbreviated? */ if (!(p->flags & PARSE_OPT_KEEP_UNKNOWN) && |