mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
[PATCH] Performance fix for pickaxe.
The pickaxe was expanding the blobs and searching in them even when it should have already known that both sides are the same. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
f7c1512af8
commit
046aa6440f
|
@ -44,7 +44,8 @@ void diffcore_pickaxe(const char *needle)
|
|||
if (contains(p->one, needle, len))
|
||||
diff_q(&outq, p);
|
||||
}
|
||||
else if (contains(p->one, needle, len) !=
|
||||
else if (!diff_unmodified_pair(p) &&
|
||||
contains(p->one, needle, len) !=
|
||||
contains(p->two, needle, len))
|
||||
diff_q(&outq, p);
|
||||
if (onum == outq.nr)
|
||||
|
|
Loading…
Reference in a new issue