| 111 | } |
| 112 | |
| 113 | void resolve_undo_clear_index(struct index_state *istate) |
| 114 | { |
| 115 | struct string_list *resolve_undo = istate->resolve_undo; |
| 116 | if (!resolve_undo) |
| 117 | return; |
| 118 | string_list_clear(resolve_undo, 1); |
| 119 | free(resolve_undo); |
| 120 | istate->resolve_undo = NULL; |
| 121 | istate->cache_changed |= RESOLVE_UNDO_CHANGED; |
| 122 | } |
| 123 | |
| 124 | int unmerge_index_entry(struct index_state *istate, const char *path, |
| 125 | struct resolve_undo_info *ru, unsigned ce_flags) |
no test coverage detected