summaryrefslogtreecommitdiff
path: root/builtin/mv.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-20 00:05:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-20 00:05:34 (GMT)
commitb052781fef2f978ba9cc55d6de942bb779bd54ac (patch)
tree30ae395bf7aef07e7f06d340e644be44f267a7d3 /builtin/mv.c
parentab2fadefaba58de4229f6d31a1da9f285139be6a (diff)
parent534376ca04d524b99d69a30bdcf5e70ac8062aee (diff)
downloadgit-b052781fef2f978ba9cc55d6de942bb779bd54ac.zip
git-b052781fef2f978ba9cc55d6de942bb779bd54ac.tar.gz
git-b052781fef2f978ba9cc55d6de942bb779bd54ac.tar.bz2
Merge branch 'jk/maint-mv'
* jk/maint-mv: mv: be quiet about overwriting mv: improve overwrite warning mv: make non-directory destination error more clear mv: honor --verbose flag docs: mention "-k" for both forms of "git mv"
Diffstat (limited to 'builtin/mv.c')
-rw-r--r--builtin/mv.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/mv.c b/builtin/mv.c
index 5efe6c5..2a144b0 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"),
@@ -93,7 +94,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
destination = copy_pathspec(dest_path[0], argv, argc, 1);
} else {
if (argc != 1)
- usage_with_options(builtin_mv_usage, builtin_mv_options);
+ die("destination '%s' is not a directory", dest_path[0]);
destination = dest_path;
}
@@ -176,7 +177,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(_("%s; will overwrite!"), bad);
+ if (verbose)
+ warning(_("overwriting '%s'"), dst);
bad = NULL;
} else
bad = _("Cannot overwrite");