diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-09 11:01:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-09 18:24:50 (GMT) |
| commit | be3ce6b2505467d445c671feeb76e7ad1c40aee7 (patch) | |
| tree | f4017f5509cfd32fb09b4037b9988a231fe3f832 /parse-options.h | |
| parent | e1bea2c0d667d13b92919490757af388f2b441e4 (diff) | |
| download | git-be3ce6b2505467d445c671feeb76e7ad1c40aee7.zip git-be3ce6b2505467d445c671feeb76e7ad1c40aee7.tar.gz git-be3ce6b2505467d445c671feeb76e7ad1c40aee7.tar.bz2 | |
completion: use __gitcomp_builtin in _git_am
The new completable options are:
--directory
--exclude
--gpg-sign
--include
--keep-cr
--keep-non-patch
--message-id
--no-keep-cr
--patch-format
--quiet
--reject
--resolvemsg=
In-progress options like --continue will be part of --git-completion-helper
then filtered out by _git_am() unless the operation is in progress. This
helps keep marking of these operations in just one place.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'parse-options.h')
| -rw-r--r-- | parse-options.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/parse-options.h b/parse-options.h index 3c32401..009cd86 100644 --- a/parse-options.h +++ b/parse-options.h @@ -144,8 +144,8 @@ struct option { #define OPT_STRING_LIST(s, l, v, a, h) \ { OPTION_CALLBACK, (s), (l), (v), (a), \ (h), 0, &parse_opt_string_list } -#define OPT_UYN(s, l, v, h) { OPTION_CALLBACK, (s), (l), (v), NULL, \ - (h), PARSE_OPT_NOARG, &parse_opt_tertiary } +#define OPT_UYN(s, l, v, h, f) { OPTION_CALLBACK, (s), (l), (v), NULL, \ + (h), PARSE_OPT_NOARG|(f), &parse_opt_tertiary } #define OPT_DATE(s, l, v, h) \ { OPTION_CALLBACK, (s), (l), (v), N_("time"),(h), 0, \ parse_opt_approxidate_cb } |