undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch: convert do_fetch to take a struct refspec

Browse Source 
Convert 'do_fetch()' to take a 'struct refspec' as a parameter instead
of a list of 'struct refspec_item'.

Signed-off-by: Brandon Williams <bmwill@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Brandon Williams 2018-05-16 15:58:07 -07:00 committed by Junio C Hamano
parent 860fdf1e6e
commit 65a1301f2e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builtin/fetch.c
View File

@ -1112,7 +1112,7 @@ static void backfill_tags(struct transport *transport, struct ref *ref_map)
} }
static int do_fetch(struct transport *transport, static int do_fetch(struct transport *transport,
struct refspec_item *refs, int ref_count) struct refspec *rs)
{ {
struct string_list existing_refs = STRING_LIST_INIT_DUP; struct string_list existing_refs = STRING_LIST_INIT_DUP;
struct ref *ref_map; struct ref *ref_map;
@ -1136,7 +1136,7 @@ static int do_fetch(struct transport *transport,
goto cleanup; goto cleanup;
} }
ref_map = get_ref_map(transport, refs, ref_count, tags, &autotags); ref_map = get_ref_map(transport, rs->items, rs->nr, tags, &autotags);
if (!update_head_ok) if (!update_head_ok)
check_not_current_branch(ref_map); check_not_current_branch(ref_map);
@ -1160,8 +1160,8 @@ static int do_fetch(struct transport *transport,
* explicitly (via command line or configuration); we * explicitly (via command line or configuration); we
* don't care whether --tags was specified. * don't care whether --tags was specified.
*/ */
if (ref_count) { if (rs->nr) {
prune_refs(refs, ref_count, ref_map, transport->url); prune_refs(rs->items, rs->nr, ref_map, transport->url);
} else { } else {
prune_refs(transport->remote->fetch.items, prune_refs(transport->remote->fetch.items,
transport->remote->fetch.nr, transport->remote->fetch.nr,
@ -1410,7 +1410,7 @@ static int fetch_one(struct remote *remote, int argc, const char **argv, int pru
sigchain_push_common(unlock_pack_on_signal); sigchain_push_common(unlock_pack_on_signal);
atexit(unlock_pack); atexit(unlock_pack);
exit_code = do_fetch(gtransport, rs.items, rs.nr); exit_code = do_fetch(gtransport, &rs);
refspec_clear(&rs); refspec_clear(&rs);
transport_disconnect(gtransport); transport_disconnect(gtransport);
gtransport = NULL; gtransport = NULL;