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

completion: use __gitcomp_builtin in _git_notes

Browse Source 
The new completable options are:

--allow-empty (notes add and notes append)
--for-rewrite= (notes copy)

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-02-09 18:02:08 +07:00 committed by Junio C Hamano
parent d73a59d12f
commit 7a60e3bb83
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/notes.c
View File

@ -413,7 +413,7 @@ static int add(int argc, const char **argv, const char *prefix)
parse_reuse_arg},
OPT_BOOL(0, "allow-empty", &allow_empty,
N_("allow storing empty note")),
OPT__FORCE(&force, N_("replace existing notes"), 0),
OPT__FORCE(&force, N_("replace existing notes"), PARSE_OPT_NOCOMPLETE),
OPT_END()
};
@ -484,7 +484,7 @@ static int copy(int argc, const char **argv, const char *prefix)
struct notes_tree *t;
const char *rewrite_cmd = NULL;
struct option options[] = {
OPT__FORCE(&force, N_("replace existing notes"), 0),
OPT__FORCE(&force, N_("replace existing notes"), PARSE_OPT_NOCOMPLETE),
OPT_BOOL(0, "stdin", &from_stdin, N_("read objects from stdin")),
OPT_STRING(0, "for-rewrite", &rewrite_cmd, N_("command"),
N_("load rewriting config for <command> (implies "

14
contrib/completion/git-completion.bash
View File

@ -1835,7 +1835,7 @@ _git_notes ()
case "$subcommand,$cur" in
,--*)
__gitcomp '--ref'
__gitcomp_builtin notes
;;
,*)
case "$prev" in
@ -1851,15 +1851,17 @@ _git_notes ()
add,--reedit-message=*|append,--reedit-message=*)
__git_complete_refs --cur="${cur#*=}"
;;
add,--*|append,--*)
__gitcomp '--file= --message= --reedit-message=
--reuse-message='
add,--*)
__gitcomp_builtin notes_add
;;
append,--*)
__gitcomp_builtin notes_append
;;
copy,--*)
__gitcomp '--stdin'
__gitcomp_builtin notes_copy
;;
prune,--*)
__gitcomp '--dry-run --verbose'
__gitcomp_builtin notes_prune
;;
prune,*)
;;