projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Remove a function not used anymore.
[git.git]
/
diffcore-pickaxe.c
diff --git
a/diffcore-pickaxe.c
b/diffcore-pickaxe.c
index
9b9d0b7
..
4919009
100644
(file)
--- a/
diffcore-pickaxe.c
+++ b/
diffcore-pickaxe.c
@@
-21,7
+21,7
@@
static int contains(struct diff_filespec *one,
return 0;
}
return 0;
}
-void diff_pickaxe(const char *needle)
+void diff
core
_pickaxe(const char *needle)
{
struct diff_queue_struct *q = &diff_queued_diff;
unsigned long len = strlen(needle);
{
struct diff_queue_struct *q = &diff_queued_diff;
unsigned long len = strlen(needle);
@@
-32,24
+32,24
@@
void diff_pickaxe(const char *needle)
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
- if (!p->one->file_valid) {
- if (!p->two->file_valid)
+ int onum = outq.nr;
+ if (!DIFF_FILE_VALID(p->one)) {
+ if (!DIFF_FILE_VALID(p->two))
continue; /* ignore nonsense */
/* created */
if (contains(p->two, needle, len))
continue; /* ignore nonsense */
/* created */
if (contains(p->two, needle, len))
- diff_q
ueue(&outq, p->one, p->two
);
+ diff_q
(&outq, p
);
}
}
- else if (!
p->two->file_valid
) {
+ else if (!
DIFF_FILE_VALID(p->two)
) {
if (contains(p->one, needle, len))
if (contains(p->one, needle, len))
- diff_q
ueue(&outq, p->one, p->two
);
+ 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_queue(&outq, p->one, p->two);
- }
- for (i = 0; i < q->nr; i++) {
- struct diff_filepair *p = q->queue[i];
- free(p);
+ diff_q(&outq, p);
+ if (onum == outq.nr)
+ diff_free_filepair(p);
}
free(q->queue);
*q = outq;
}
free(q->queue);
*q = outq;