diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:32:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:32:36 -0800 |
| commit | 699eb54876669f0c109a34e0c01a9dd0c67725fa (patch) | |
| tree | 0c78610efb2357dae7add948a9ecec49d5ba2091 /builtin | |
| parent | Merge branch 'jk/fetch-no-tail-match-refs' into maint (diff) | |
| parent | mv: be quiet about overwriting (diff) | |
| download | tgif-699eb54876669f0c109a34e0c01a9dd0c67725fa.tar.xz | |
Merge branch 'jk/maint-mv' into maint
* 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')
| -rw-r--r-- | builtin/mv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index 5efe6c5760..2a144b011c 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"); |