From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Cc: lists@haller-berlin.de (Stefan Haller)
Subject: [PATCH 0/3] Falling back "diff -C -C" to "diff -C" more gracefully
Date: Thu, 6 Jan 2011 13:50:03 -0800 [thread overview]
Message-ID: <1294350606-19530-1-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <7vhbdlahnp.fsf@alter.siamese.dyndns.org>
In a project with many paths, "diff -C -C" may have too many rename source
candidates (as it tries to use all existing paths) but the rename source
candidates "diff -C" would use may still fit under the rename detection
limit. Currently, we punt and disable the inexact rename detection
altogether even in such a case.
This weatherballoon series illustrates how diffcore-rename can be tweaked
to allow "-C -C" to fall back to "-C". Somebody should write a test, but
not today ;-).
Junio C Hamano (3):
diffcore-rename: refactor "too many candidates" logic
diffcore-rename: record filepair for rename src
diffcore-rename: fall back to -C when -C -C busts the rename limit
diffcore-rename.c | 97 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 26 deletions(-)
--
1.7.4.rc1.214.g2a4f9
next prev parent reply other threads:[~2011-01-06 21:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-05 17:46 --find-copies-harder finds fewer copies/renames than -C does Stefan Haller
2011-01-05 18:59 ` Junio C Hamano
2011-01-06 16:54 ` Stefan Haller
2011-01-06 20:42 ` Junio C Hamano
2011-01-06 21:50 ` Junio C Hamano [this message]
2011-01-06 21:50 ` [PATCH 1/3] diffcore-rename: refactor "too many candidates" logic Junio C Hamano
2011-01-06 21:50 ` [PATCH 2/3] diffcore-rename: record filepair for rename src Junio C Hamano
2011-01-06 21:50 ` [PATCH 3/3] diffcore-rename: fall back to -C when -C -C busts the rename limit Junio C Hamano
2011-01-06 22:28 ` [PATCH 0/3] Falling back "diff -C -C" to "diff -C" more gracefully 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=1294350606-19530-1-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=lists@haller-berlin.de \
/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).