diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-02-09 18:01:47 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-09 10:24:50 -0800 |
| commit | c01b56a3a8a375e5473b2548fec55fa408f098e0 (patch) | |
| tree | bb213c0ff903e6c2d2f6063ff2658b740abf0feb | |
| parent | b8e9d6629426d2e955ffbf038a4386f5e0242be7 (diff) | |
| download | git-c01b56a3a8a375e5473b2548fec55fa408f098e0.tar.gz | |
completion: use __gitcomp_builtin in _git_branch
The new completable options are:
--all
--create-reflog
--format=
--ignore-case
--quiet
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rw-r--r-- | contrib/completion/git-completion.bash | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/builtin/branch.c b/builtin/branch.c index b5b62c08ba..6d0cea9d4b 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -615,7 +615,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")), OPT_BOOL(0, "edit-description", &edit_description, N_("edit the description for the branch")), - OPT__FORCE(&force, N_("force creation, move/rename, deletion"), 0), + OPT__FORCE(&force, N_("force creation, move/rename, deletion"), PARSE_OPT_NOCOMPLETE), OPT_MERGED(&filter, N_("print only branches that are merged")), OPT_NO_MERGED(&filter, N_("print only branches that are not merged")), OPT_COLUMN(0, "column", &colopts, N_("list branches in columns")), diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 2fd3fc999e..d926518fb7 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -1220,12 +1220,8 @@ _git_branch () __git_complete_refs --cur="${cur##--set-upstream-to=}" ;; --*) - __gitcomp " - --color --no-color --verbose --abbrev= --no-abbrev - --track --no-track --contains --no-contains --merged --no-merged - --set-upstream-to= --edit-description --list - --unset-upstream --delete --move --copy --remotes - --column --no-column --sort= --points-at + __gitcomp_builtin branch "--no-color --no-abbrev + --no-track --no-column " ;; *) |