summaryrefslogtreecommitdiff
path: root/builtin/mv.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-12-12 21:54:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-12-12 23:43:38 (GMT)
commitcd40b05d13676a41fc68807c351d0de07eb4c270 (patch)
tree0af2dd362c8f00e948a8ce66ca5c849d4f68dd30 /builtin/mv.c
parent77471646d3d87691b4bcf11682945e6ccc27f9e3 (diff)
downloadgit-cd40b05d13676a41fc68807c351d0de07eb4c270.zip
git-cd40b05d13676a41fc68807c351d0de07eb4c270.tar.gz
git-cd40b05d13676a41fc68807c351d0de07eb4c270.tar.bz2
mv: improve overwrite warning
When we try to "git mv" over an existing file, the error message is fairly informative: $ git mv one two fatal: destination exists, source=one, destination=two When the user forces the overwrite, we give a warning: $ git mv -f one two warning: destination exists; will overwrite! This is less informative, but still sufficient in the simple rename case, as there is only one rename happening. But when moving files from one directory to another, it becomes useless: $ mkdir three $ touch one two three/one $ git add . $ git mv one two three fatal: destination exists, source=one, destination=three/one $ git mv -f one two three warning: destination exists; will overwrite! The first message is helpful, but the second one gives us no clue about what was overwritten. Let's mention the name of the destination file: $ git mv -f one two three warning: overwriting 'three/one' 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/mv.c b/builtin/mv.c
index 177e543..4a8374f 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -173,7 +173,7 @@ 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);
+ warning(_("overwriting '%s'"), dst);
bad = NULL;
} else
bad = _("Cannot overwrite");