void unmerge_marked_index(struct index_state *istate) { int i; if (!istate->resolve_undo) return; for (i = 0; i < istate->cache_nr; i++) { const struct cache_entry *ce = istate->cache[i]; if (ce->ce_flags & CE_MATCHED) i = unmerge_index_entry_at(istate, i); } }
void unmerge_index(struct index_state *istate, const char **pathspec) { int i; if (!istate->resolve_undo) return; for (i = 0; i < istate->cache_nr; i++) { struct cache_entry *ce = istate->cache[i]; if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, NULL)) continue; i = unmerge_index_entry_at(istate, i); } }
void unmerge_index(struct index_state *istate, const struct pathspec *pathspec) { int i; if (!istate->resolve_undo) return; for (i = 0; i < istate->cache_nr; i++) { const struct cache_entry *ce = istate->cache[i]; if (!ce_path_match(ce, pathspec, NULL)) continue; i = unmerge_index_entry_at(istate, i); } }
int unmerge_index_entry_at(struct index_state *istate, int pos) { const struct cache_entry *ce; struct string_list_item *item; struct resolve_undo_info *ru; int i, err = 0, matched; if (!istate->resolve_undo) return pos; ce = istate->cache[pos]; if (ce_stage(ce)) { /* already unmerged */ while ((pos < istate->cache_nr) && ! strcmp(istate->cache[pos]->name, ce->name)) pos++; return pos - 1; /* return the last entry processed */ } item = string_list_lookup(istate->resolve_undo, ce->name); if (!item) return pos; ru = item->util; if (!ru) return pos; matched = ce->ce_flags & CE_MATCHED; remove_index_entry_at(istate, pos); for (i = 0; i < 3; i++) { struct cache_entry *nce; if (!ru->mode[i]) continue; nce = make_cache_entry(ru->mode[i], ru->sha1[i], ce->name, i + 1, 0); if (matched) nce->ce_flags |= CE_MATCHED; if (add_index_entry(istate, nce, ADD_CACHE_OK_TO_ADD)) { err = 1; error("cannot unmerge '%s'", ce->name); } } if (err) return pos; free(ru); item->util = NULL; return unmerge_index_entry_at(istate, pos); }