From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
To: Jeff King <peff@peff.net>
Cc: Junio C Hamano <gitster@pobox.com>,
Andrew Morton <akpm@linux-foundation.org>,
git@vger.kernel.org
Subject: Re: [PATCH 3/3] diff: make "too many files" rename warning optional
Date: Sat, 03 May 2008 18:34:31 +0100 [thread overview]
Message-ID: <481CA227.1000801@ramsay1.demon.co.uk> (raw)
In-Reply-To: <20080430172553.GC23747@sigill.intra.peff.net>
Jeff King wrote:
> In many cases, the warning ends up as clutter, because the
> diff is being done "behind the scenes" from the user (e.g.,
> when generating a commit diffstat), and whether we show
> renames or not is not particularly interesting to the user.
>
[snip]
> diff --git a/diffcore-rename.c b/diffcore-rename.c
> index 1369a5e..1b2ebb4 100644
> --- a/diffcore-rename.c
> +++ b/diffcore-rename.c
> @@ -492,7 +492,8 @@ void diffcore_rename(struct diff_options *options)
> rename_limit = 32767;
> if ((num_create > rename_limit && num_src > rename_limit) ||
> (num_create * num_src > rename_limit * rename_limit)) {
> - warning("too many files, skipping inexact rename detection");
> + if (options->warn_on_too_large_rename)
> + warning("too many files, skipping inexact rename detection");
> goto cleanup;
> }
>
This will also fix the problem I had with gitk on cygwin; namely "gitk --all &" on my
"git" repo pops up an error dialog (see below), after which the diff display disappears.
The error dialog shows:
--- >8 ---
warning: too many files, skipping inexact rename detection
warning: too many files, skipping inexact rename detection
while executing
"close $bdf"
(procedure "getblobdiffline" line 89)
invoked from within
"getblobdiffline file102daa00 1d6aeb410dc19893adbc0209bcf859f35ff1c7d6"
("eval" body line 1)
invoked from within
"eval $script"
(procedure "dorunq" line 9)
invoked from within
"dorunq"
("after" script)
--- 8< ---
The git command issued by gitk appears to be:
git diff-tree -r -p -C --no-commit-id -U3 1d6aeb410dc19893adbc0209bcf859f35ff1c7d6
However, if I type the above into bash (and include --no-pager), then the error
message does not appear! Ho hum. Also, the same repo on Linux does not exhibit this
problem at all.
In any event, if the above warning() call is commented out, then gitk is quite happy
on cygwin as well.
All the best,
Ramsay Jones
next prev parent reply other threads:[~2008-05-03 17:49 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-04-26 13:32 warning: too many files, skipping inexact rename detection Andrew Morton
2008-04-26 13:57 ` Jeff King
2008-04-26 14:06 ` Andrew Morton
2008-04-26 14:52 ` Jeff King
2008-04-30 17:21 ` [PATCH 0/3] rename limit improvements Jeff King
2008-04-30 17:23 ` [PATCH 1/3] add merge.renamelimit config option Jeff King
2008-04-30 18:18 ` Jeff King
2008-05-03 20:15 ` Junio C Hamano
2008-05-04 19:31 ` Jeff King
2008-04-30 17:24 ` [PATCH 2/3] bump rename limit defaults Jeff King
2008-04-30 17:25 ` [PATCH 3/3] diff: make "too many files" rename warning optional Jeff King
2008-05-03 17:34 ` Ramsay Jones [this message]
2008-05-04 19:23 ` Jeff King
2008-05-04 23:28 ` Paul Mackerras
2008-05-05 13:59 ` Jeff King
2008-05-05 17:02 ` Jeff King
2008-05-05 19:52 ` Junio C Hamano
2008-05-12 11:15 ` Paul Mackerras
2008-05-06 22:33 ` Ramsay Jones
2008-05-06 22:29 ` Ramsay Jones
2008-05-04 0:10 ` Junio C Hamano
2008-05-04 19:20 ` Jeff King
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=481CA227.1000801@ramsay1.demon.co.uk \
--to=ramsay@ramsay1.demon.co.uk \
--cc=akpm@linux-foundation.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).