From: Jeff King <peff@peff.net>
To: Jari Aalto <jari.aalto@cante.net>
Cc: git@vger.kernel.org
Subject: [PATCH 2/5] mv: honor --verbose flag
Date: Mon, 12 Dec 2011 02:51:24 -0500 [thread overview]
Message-ID: <20111212075124.GB17532@sigill.intra.peff.net> (raw)
In-Reply-To: <20111212074503.GB16511@sigill.intra.peff.net>
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>
---
This has been broken since 2006, so I guess nobody really cares. But
it's simple to fix.
Documentation/git-mv.txt | 8 ++++++--
builtin/mv.c | 1 +
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt
index 4be7a71..e3c8448 100644
--- a/Documentation/git-mv.txt
+++ b/Documentation/git-mv.txt
@@ -15,8 +15,8 @@ DESCRIPTION
-----------
This script is used to move or rename a file, directory or symlink.
- git mv [-f] [-n] [-k] <source> <destination>
- git mv [-f] [-n] [-k] <source> ... <destination directory>
+ git mv [-v] [-f] [-n] [-k] <source> <destination>
+ git mv [-v] [-f] [-n] [-k] <source> ... <destination directory>
In the first form, it renames <source>, which must exist and be either
a file, symlink or directory, to <destination>.
@@ -40,6 +40,10 @@ OPTIONS
--dry-run::
Do nothing; only show what would happen
+-v::
+--verbose::
+ Report the names of files as they are moved.
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/builtin/mv.c b/builtin/mv.c
index 5efe6c5..11abaf5 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -59,6 +59,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
int i, newfd;
int verbose = 0, show_only = 0, force = 0, ignore_errors = 0;
struct option builtin_mv_options[] = {
+ OPT__VERBOSE(&verbose, "be verbose"),
OPT__DRY_RUN(&show_only, "dry run"),
OPT__FORCE(&force, "force move/rename even if target exists"),
OPT_BOOLEAN('k', NULL, &ignore_errors, "skip move/rename errors"),
--
1.7.8.13.g74677
next prev parent reply other threads:[~2011-12-12 7:51 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-11 21:22 git 1.7.7.3: BUG - please make git mv -f quiet Jari Aalto
2011-12-12 7:45 ` [PATCH 0/5] mixed bag of minor "git mv" fixes Jeff King
2011-12-12 7:50 ` [PATCH 1/5] docs: mention "-k" for both forms of "git mv" Jeff King
2011-12-12 19:52 ` Junio C Hamano
2011-12-12 7:51 ` Jeff King [this message]
2011-12-12 19:53 ` [PATCH 2/5] mv: honor --verbose flag Junio C Hamano
2011-12-12 21:45 ` Jeff King
2011-12-12 7:51 ` [PATCH 3/5] mv: make non-directory destination error more clear Jeff King
2011-12-12 19:55 ` Junio C Hamano
2011-12-12 7:52 ` [PATCH 4/5] mv: improve overwrite warning Jeff King
2011-12-12 19:57 ` Junio C Hamano
2011-12-12 21:52 ` Jeff King
2011-12-12 21:54 ` [PATCHv2 " Jeff King
2011-12-12 21:54 ` [PATCHv2 5/5] mv: be quiet about overwriting Jeff King
2011-12-12 7:54 ` [PATCH " Jeff King
2011-12-12 19:59 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111212075124.GB17532@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=jari.aalto@cante.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).