summaryrefslogtreecommitdiff
path: root/builtin/worktree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-03-14 19:01:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-03-14 19:01:07 (GMT)
commit7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806 (patch)
treeef9ef31f2e17a35974152e821b02bd2d8ae33ce6 /builtin/worktree.c
parent99321e327b4df8d9d6724cf26bab7429edbdb718 (diff)
parent27b42d045c06b6138555fef2b00d8d72220bc8be (diff)
downloadgit-7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806.zip
git-7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806.tar.gz
git-7fb6aefd2aaffe66e614f7f7b83e5b7ab16d4806.tar.bz2
Merge branch 'nd/parseopt-completion'
Teach parse-options API an option to help the completion script, and make use of the mechanism in command line completion. * nd/parseopt-completion: (45 commits) completion: more subcommands in _git_notes() completion: complete --{reuse,reedit}-message= for all notes subcmds completion: simplify _git_notes completion: don't set PARSE_OPT_NOCOMPLETE on --rerere-autoupdate completion: use __gitcomp_builtin in _git_worktree completion: use __gitcomp_builtin in _git_tag completion: use __gitcomp_builtin in _git_status completion: use __gitcomp_builtin in _git_show_branch completion: use __gitcomp_builtin in _git_rm completion: use __gitcomp_builtin in _git_revert completion: use __gitcomp_builtin in _git_reset completion: use __gitcomp_builtin in _git_replace remote: force completing --mirror= instead of --mirror completion: use __gitcomp_builtin in _git_remote completion: use __gitcomp_builtin in _git_push completion: use __gitcomp_builtin in _git_pull completion: use __gitcomp_builtin in _git_notes completion: use __gitcomp_builtin in _git_name_rev completion: use __gitcomp_builtin in _git_mv completion: use __gitcomp_builtin in _git_merge_base ...
Diffstat (limited to 'builtin/worktree.c')
-rw-r--r--builtin/worktree.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 1c1e576..670555d 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -381,7 +381,9 @@ static int add(int ac, const char **av, const char *prefix)
const char *branch;
const char *opt_track = NULL;
struct option options[] = {
- OPT__FORCE(&opts.force, N_("checkout <branch> even if already checked out in other worktree")),
+ OPT__FORCE(&opts.force,
+ N_("checkout <branch> even if already checked out in other worktree"),
+ PARSE_OPT_NOCOMPLETE),
OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
N_("create a new branch")),
OPT_STRING('B', NULL, &new_branch_force, N_("branch"),