apply: split quoted filename handling into new function

diff --git a/resolve-undo.c b/resolve-undo.c
index 8b935594aaa707a6eff146a998250196ae2a654b..174ebec9e573b1942e379942037f38500bd19b97 100644 (file)
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -135,7 +135,7 @@ int unmerge_index_entry_at(struct index_state *istate, int pos)
                        pos++;
                return pos - 1; /* return the last entry processed */
        }
-       item = string_list_lookup(ce->name, istate->resolve_undo);
+       item = string_list_lookup(istate->resolve_undo, ce->name);
        if (!item)
                return pos;
        ru = item->util;