kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

[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>
maint
Junio C Hamano 2005-05-23 00:25:15 -07:00 committed by Linus Torvalds
parent f7c1512af8
commit 046aa6440f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
diffcore-pickaxe.c
View File

@ -44,7 +44,8 @@ void diffcore_pickaxe(const char *needle)
if (contains(p->one, needle, len)) if (contains(p->one, needle, len))
diff_q(&outq, p); 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)) contains(p->two, needle, len))
diff_q(&outq, p); diff_q(&outq, p);
if (onum == outq.nr) if (onum == outq.nr)