diff options
| author | René Scharfe <rene.scharfe@lsrfire.ath.cx> | 2011-09-25 17:39:08 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-26 22:38:14 +0400 |
| commit | c5aa90682f82fe0dabdc0280be93568d52efddfc (patch) | |
| tree | 1aad9b101300368bdbb9c60f84f48f3279ef9ca5 /git-cvsimport.perl | |
| parent | 27af01d552331eacf1ed2671b2b4b6ad4c268106 (diff) | |
Revert removal of multi-match discard heuristic in 27af01
27af01d (xdiff/xprepare: improve O(n*m) performance in
xdl_cleanup_records(), 2011-08-17) was supposed to be a performance
boost only. However, it unexpectedly changed the behaviour of diff.
Revert a part of 27af01d that removes logic that mark lines as
"multi-match" (ie. dis[i] == 2). This was preventing the multi-match
discard heuristic (performed in xdl_cleanup_records() and
xdl_clean_mmatch()) from executing.
Reported-by: Alexander Pepper <pepper@inf.fu-berlin.de>
Signed-off-by: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-cvsimport.perl')
0 files changed, 0 insertions, 0 deletions