summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJulian Phillips <julian@quantumfyre.co.uk>2010-06-26 00:41:37 +0100
committerJunio C Hamano <gitster@pobox.com>2010-06-27 10:06:51 -0700
commite8c8b7139c87c3e3017d3bff07f91c4349850d58 (patch)
treeb9de12fa2da7003bf851889938d22c99ad0d1c6b /resolve-undo.c
parentaadceea641806b363ca555ffdc04109ea716c497 (diff)
downloadgit-e8c8b7139c87c3e3017d3bff07f91c4349850d58.tar.gz
string_list: Fix argument order for string_list_lookup
Update the definition and callers of string_list_lookup to use the string_list as the first argument. This helps make the string_list API easier to use by being more consistent. Signed-off-by: Julian Phillips <julian@quantumfyre.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.c')
-rw-r--r--resolve-undo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.c b/resolve-undo.c
index 8b935594aa..174ebec9e5 100644
--- 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;