summaryrefslogtreecommitdiff
path: root/resolve-undo.c
diff options
context:
space:
mode:
authorJulian Phillips <julian@quantumfyre.co.uk>2010-06-26 00:41:35 +0100
committerJunio C Hamano <gitster@pobox.com>2010-06-27 10:06:51 -0700
commit78a395d371ec9fd14297178ec98b8b1042a64fb6 (patch)
treef155b25e547c4c454f5ff1fd0f21398eb27887ee /resolve-undo.c
parentb684e977363ee5cb53d83c69f2298d7898c5f89a (diff)
downloadgit-78a395d371ec9fd14297178ec98b8b1042a64fb6.tar.gz
string_list: Fix argument order for string_list_insert
Update the definition and callers of string_list_insert 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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/resolve-undo.c b/resolve-undo.c
index e93b3d1b53..8b935594aa 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -20,7 +20,7 @@ void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
istate->resolve_undo = resolve_undo;
}
resolve_undo = istate->resolve_undo;
- lost = string_list_insert(ce->name, resolve_undo);
+ lost = string_list_insert(resolve_undo, ce->name);
if (!lost->util)
lost->util = xcalloc(1, sizeof(*ui));
ui = lost->util;
@@ -70,7 +70,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
len = strlen(data) + 1;
if (size <= len)
goto error;
- lost = string_list_insert(data, resolve_undo);
+ lost = string_list_insert(resolve_undo, data);
if (!lost->util)
lost->util = xcalloc(1, sizeof(*ui));
ui = lost->util;