completion: use __gitcomp_builtin in _git_mv

pclouds · gitster · commit 61d15cd63cf7 · 2018-02-09T10:24:52.000-08:00
The new completable option is --verbose.

Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/mv.c b/builtin/mv.c
@@ -122,7 +122,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 	struct option builtin_mv_options[] = {
 		OPT__VERBOSE(&verbose, N_("be verbose")),
 		OPT__DRY_RUN(&show_only, N_("dry run")),
-		OPT__FORCE(&force, N_("force move/rename even if target exists"), 0),
+		OPT__FORCE(&force, N_("force move/rename even if target exists"),
+			   PARSE_OPT_NOCOMPLETE),
 		OPT_BOOL('k', NULL, &ignore_errors, N_("skip move/rename errors")),
 		OPT_END(),
 	};
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1809,7 +1809,7 @@ _git_mv ()
 {
 	case "$cur" in
 	--*)
-		__gitcomp "--dry-run"
+		__gitcomp_builtin mv
 		return
 		;;
 	esac

Original file line number	Diff line number	Diff line change
`@@ -1809,7 +1809,7 @@ _git_mv ()`
`1809`	`1809`	`{`
`1810`	`1810`	`case "$cur" in`
`1811`	`1811`	`--*)`
`1812`		`- __gitcomp "--dry-run"`
	`1812`	`+ __gitcomp_builtin mv`
`1813`	`1813`	`return`
`1814`	`1814`	`;;`
`1815`	`1815`	`esac`