From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: Jari Aalto <jari.aalto@cante•net>, git@vger•kernel.org
Subject: Re: [PATCH 4/5] mv: improve overwrite warning
Date: Mon, 12 Dec 2011 11:57:31 -0800 [thread overview]
Message-ID: <7vobvd36ms.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20111212075227.GD17532@sigill.intra.peff.net> (Jeff King's message of "Mon, 12 Dec 2011 02:52:27 -0500")
Jeff King <peff@peff•net> writes:
> This message looks overly long to me, but I wanted to match the existing
> messages. Another option would be just:
>
> warning: overwriting 'three/one'
Yes, I think it makes perfect sense to drop the ugly "source=one destination=two"
cruft, both for single-source and multiple-source cases.
> builtin/mv.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/builtin/mv.c b/builtin/mv.c
> index ae6c30c..c9ecb03 100644
> --- a/builtin/mv.c
> +++ b/builtin/mv.c
> @@ -177,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);
> + warning(_("%s (will overwrite), source=%s, destination=%s"),
> + bad, src, dst);
> bad = NULL;
> } else
> bad = _("Cannot overwrite");
next prev parent reply other threads:[~2011-12-12 19:57 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 ` [PATCH 2/5] mv: honor --verbose flag Jeff King
2011-12-12 19:53 ` 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 [this message]
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=7vobvd36ms.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jari.aalto@cante$(echo .)net \
--cc=peff@peff$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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