Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: changes in parse_insn_buffer()
[gitweb.git]
/
resolve-undo.c
diff --git
a/resolve-undo.c
b/resolve-undo.c
index c30ae5cf49aab6a3a88060740ffc679ad940c2aa..236320f179cbf60a312f882ee57e1f843398e907 100644
(file)
--- a/
resolve-undo.c
+++ b/
resolve-undo.c
@@
-188,7
+188,7
@@
void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
for (i = 0; i < istate->cache_nr; i++) {
const struct cache_entry *ce = istate->cache[i];
- if (!ce_path_match(ce, pathspec, NULL))
+ if (!ce_path_match(
istate,
ce, pathspec, NULL))
continue;
i = unmerge_index_entry_at(istate, i);
}