[PATCH 0/3] Falling back "diff -C -C" to "diff -C" more gracefully
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 6, 2011, 21:50 UTC
- Message-ID
- <1294350606-19530-1-git-send-email-gitster@pobox.com>
- 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