| 1460 | } |
| 1461 | |
| 1462 | static struct combine_diff_path *combined_objfind(struct diff_options *opt, |
| 1463 | struct combine_diff_path *paths, |
| 1464 | int num_parent) |
| 1465 | { |
| 1466 | struct combine_diff_path *ret = NULL, **tail = &ret; |
| 1467 | struct combine_diff_path *p = paths; |
| 1468 | |
| 1469 | while (p) { |
| 1470 | struct combine_diff_path *next = p->next; |
| 1471 | |
| 1472 | if (match_objfind(p, num_parent, opt->objfind)) { |
| 1473 | p->next = NULL; |
| 1474 | *tail = p; |
| 1475 | tail = &p->next; |
| 1476 | } else { |
| 1477 | free(p); |
| 1478 | } |
| 1479 | p = next; |
| 1480 | } |
| 1481 | |
| 1482 | return ret; |
| 1483 | } |
| 1484 | |
| 1485 | void diff_tree_combined(const struct object_id *oid, |
| 1486 | const struct oid_array *parents, |
no test coverage detected