Browse Source

[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 20 years ago committed by Linus Torvalds
parent
commit
046aa6440f
  1. 3
      diffcore-pickaxe.c

3
diffcore-pickaxe.c

@ -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)

Loading…
Cancel
Save