Merge branch 'jp/string-list-api-cleanup'
* jp/string-list-api-cleanup: string_list: Fix argument order for string_list_append string_list: Fix argument order for string_list_lookup string_list: Fix argument order for string_list_insert_at_index string_list: Fix argument order for string_list_insert string_list: Fix argument order for for_each_string_list string_list: Fix argument order for print_string_list
This commit is contained in:
6
remote.c
6
remote.c
@ -762,7 +762,7 @@ void ref_remove_duplicates(struct ref *ref_map)
|
||||
if (!ref_map->peer_ref)
|
||||
continue;
|
||||
|
||||
item = string_list_lookup(ref_map->peer_ref->name, &refs);
|
||||
item = string_list_lookup(&refs, ref_map->peer_ref->name);
|
||||
if (item) {
|
||||
if (strcmp(((struct ref *)item->util)->name,
|
||||
ref_map->name))
|
||||
@ -777,7 +777,7 @@ void ref_remove_duplicates(struct ref *ref_map)
|
||||
continue;
|
||||
}
|
||||
|
||||
item = string_list_insert(ref_map->peer_ref->name, &refs);
|
||||
item = string_list_insert(&refs, ref_map->peer_ref->name);
|
||||
item->util = ref_map;
|
||||
}
|
||||
string_list_clear(&refs, 0);
|
||||
@ -1710,7 +1710,7 @@ struct ref *get_stale_heads(struct remote *remote, struct ref *fetch_map)
|
||||
info.ref_names = &ref_names;
|
||||
info.stale_refs_tail = &stale_refs;
|
||||
for (ref = fetch_map; ref; ref = ref->next)
|
||||
string_list_append(ref->name, &ref_names);
|
||||
string_list_append(&ref_names, ref->name);
|
||||
sort_string_list(&ref_names);
|
||||
for_each_ref(get_stale_heads_cb, &info);
|
||||
string_list_clear(&ref_names, 0);
|
||||
|
Reference in New Issue
Block a user