projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
[PATCH] Performance fix for pickaxe.
[git.git]
/
diffcore-pickaxe.c
diff --git
a/diffcore-pickaxe.c
b/diffcore-pickaxe.c
index
be1bbcc
..
fea62d5
100644
(file)
--- a/
diffcore-pickaxe.c
+++ b/
diffcore-pickaxe.c
@@
-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)