mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-27 20:14:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

fetch: convert prune_refs to take a struct refspec

Browse Source 
Convert 'prune_refs()' 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:09 -07:00 committed by Junio C Hamano
parent 65d96c8b7d
commit def11e7193
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/fetch.c
View File

@ -959,11 +959,11 @@ static int fetch_refs(struct transport *transport, struct ref *ref_map)
return ret;
}
static int prune_refs(struct refspec_item *refs, int ref_count, struct ref *ref_map,
const char *raw_url)
static int prune_refs(struct refspec *rs, struct ref *ref_map,
const char *raw_url)
{
int url_len, i, result = 0;
struct ref *ref, *stale_refs = get_stale_heads(refs, ref_count, ref_map);
struct ref *ref, *stale_refs = get_stale_heads(rs->items, rs->nr, ref_map);
char *url;
int summary_width = transport_summary_width(stale_refs);
const char *dangling_msg = dry_run
@ -1158,10 +1158,9 @@ static int do_fetch(struct transport *transport,
* don't care whether --tags was specified.
*/
if (rs->nr) {
prune_refs(rs->items, rs->nr, ref_map, transport->url);
prune_refs(rs, ref_map, transport->url);
} else {
prune_refs(transport->remote->fetch.items,
transport->remote->fetch.nr,
prune_refs(&transport->remote->fetch,
ref_map,
transport->url);
}