| 209 | } |
| 210 | |
| 211 | static void builtin_diff_combined(struct rev_info *revs, |
| 212 | int argc, const char **argv UNUSED, |
| 213 | struct object_array_entry *ent, |
| 214 | int ents, int first_non_parent) |
| 215 | { |
| 216 | struct oid_array parents = OID_ARRAY_INIT; |
| 217 | int i; |
| 218 | |
| 219 | if (argc > 1) |
| 220 | usage(builtin_diff_usage); |
| 221 | |
| 222 | if (first_non_parent < 0) |
| 223 | die(_("no merge given, only parents.")); |
| 224 | if (first_non_parent >= ents) |
| 225 | BUG("first_non_parent out of range: %d", first_non_parent); |
| 226 | |
| 227 | diff_merges_set_dense_combined_if_unset(revs); |
| 228 | |
| 229 | for (i = 0; i < ents; i++) { |
| 230 | if (i != first_non_parent) |
| 231 | oid_array_append(&parents, &ent[i].item->oid); |
| 232 | } |
| 233 | diff_tree_combined(&ent[first_non_parent].item->oid, &parents, revs); |
| 234 | oid_array_clear(&parents); |
| 235 | } |
| 236 | |
| 237 | static void refresh_index_quietly(void) |
| 238 | { |
no test coverage detected