зеркало из https://github.com/microsoft/git.git
fetch: convert prune_refs to take a struct refspec
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:
Родитель
65d96c8b7d
Коммит
def11e7193
|
@ -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,
|
||||
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);
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче