| 585 | } |
| 586 | |
| 587 | static int warn_conflicted_path(struct index_state *istate, |
| 588 | int i, |
| 589 | struct unpack_trees_options *o) |
| 590 | { |
| 591 | char *conflicting_path = istate->cache[i]->name; |
| 592 | int count = 0; |
| 593 | |
| 594 | add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path); |
| 595 | |
| 596 | /* Find out how many higher stage entries are at same path */ |
| 597 | while ((++count) + i < istate->cache_nr && |
| 598 | !strcmp(conflicting_path, istate->cache[count + i]->name)) |
| 599 | ; /* do nothing */ |
| 600 | |
| 601 | return count; |
| 602 | } |
| 603 | |
| 604 | static inline int call_unpack_fn(const struct cache_entry * const *src, |
| 605 | struct unpack_trees_options *o) |
no test coverage detected