Merge branch 'nd/parseopt-completion' into next

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 4e7c98758fcfb93c19e3dbf58fc3167829e998b8..0cea8ca8686076d4e792bd07c5189a9a5636e779 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -379,7 +379,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"),