mv: honor --verbose flag

The code for a verbose flag has been here since "git mv" was
converted to C many years ago, but actually getting the "-v"
flag from the command line was accidentally lost in the
transition.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2011-12-12 02:51:24 -05:00 committed by Junio C Hamano
parent cfe21f05bb
commit 07b8738967
2 changed files with 7 additions and 2 deletions

View File

@ -15,8 +15,8 @@ DESCRIPTION
----------- -----------
This script is used to move or rename a file, directory or symlink. This script is used to move or rename a file, directory or symlink.
git mv [-f] [-n] [-k] <source> <destination> git mv [-v] [-f] [-n] [-k] <source> <destination>
git mv [-f] [-n] [-k] <source> ... <destination directory> git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>
In the first form, it renames <source>, which must exist and be either In the first form, it renames <source>, which must exist and be either
a file, symlink or directory, to <destination>. a file, symlink or directory, to <destination>.
@ -40,6 +40,10 @@ OPTIONS
--dry-run:: --dry-run::
Do nothing; only show what would happen Do nothing; only show what would happen
-v::
--verbose::
Report the names of files as they are moved.
GIT GIT
--- ---
Part of the linkgit:git[1] suite Part of the linkgit:git[1] suite

View File

@ -55,6 +55,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
int i, newfd; int i, newfd;
int verbose = 0, show_only = 0, force = 0, ignore_errors = 0; int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
struct option builtin_mv_options[] = { struct option builtin_mv_options[] = {
OPT__VERBOSE(&verbose, "be verbose"),
OPT__DRY_RUN(&show_only, "dry run"), OPT__DRY_RUN(&show_only, "dry run"),
OPT__FORCE(&force, "force move/rename even if target exists"), OPT__FORCE(&force, "force move/rename even if target exists"),
OPT_BOOLEAN('k', NULL, &ignore_errors, "skip move/rename errors"), OPT_BOOLEAN('k', NULL, &ignore_errors, "skip move/rename errors"),