summaryrefslogtreecommitdiff
path: root/builtin/mv.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-12-12 21:54:42 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-12 23:43:45 (GMT)
commit534376ca04d524b99d69a30bdcf5e70ac8062aee (patch)
tree1d6427be4514d96222f7e6644369e3bdd18a112e /builtin/mv.c
parentcd40b05d13676a41fc68807c351d0de07eb4c270 (diff)
downloadgit-534376ca04d524b99d69a30bdcf5e70ac8062aee.zip
git-534376ca04d524b99d69a30bdcf5e70ac8062aee.tar.gz
git-534376ca04d524b99d69a30bdcf5e70ac8062aee.tar.bz2
mv: be quiet about overwriting
When a user asks us to force a mv and overwrite the destination, we print a warning. However, since a typical use would be: $ git mv one two fatal: destination exists, source=one, destination=two $ git mv -f one two warning: overwriting 'two' this warning is just noise. We already know we're overwriting; that's why we gave -f! This patch silences the warning unless "--verbose" is given. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mv.c')
-rw-r--r--builtin/mv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/mv.c b/builtin/mv.c
index 4a8374f..10154bb 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -173,7 +173,8 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
* check both source and destination
*/
if (S_ISREG(st.st_mode) || S_ISLNK(st.st_mode)) {
- warning(_("overwriting '%s'"), dst);
+ if (verbose)
+ warning(_("overwriting '%s'"), dst);
bad = NULL;
} else
bad = _("Cannot overwrite");