Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
[PATCH] diff-raw format update take #2.
[gitweb.git]
/
diffcore-pickaxe.c
diff --git
a/diffcore-pickaxe.c
b/diffcore-pickaxe.c
index be1bbcc53f1d489dccd9e8b8ce4ad9c1c39c107b..fea62d51a090e22e43938245747e409ea7ede883 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)