diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-08-16 01:08:28 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-08-16 01:08:28 +0300 |
commit | b160b6e69d5e8231cf71b3bcacef63443849d1f9 (patch) | |
tree | a9d7d4cd00f10d1b4545b3fa3596bcd24f7c907c /transport-helper.c | |
parent | 6be44b59fc5e957b9d6e25b32b0fc38c45d50f3f (diff) | |
parent | e2842b39f4168e3cd39a53961c1e50bb940eedf1 (diff) |
Merge branch 'jt/connectivity-check-after-unshallow'
"git fetch" sometimes failed to update the remote-tracking refs,
which has been corrected.
* jt/connectivity-check-after-unshallow:
fetch-pack: unify ref in and out param
Diffstat (limited to 'transport-helper.c')
-rw-r--r-- | transport-helper.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/transport-helper.c b/transport-helper.c index 0a71929105..143ca008c8 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -651,16 +651,14 @@ static int connect_helper(struct transport *transport, const char *name, } static int fetch(struct transport *transport, - int nr_heads, struct ref **to_fetch, - struct ref **fetched_refs) + int nr_heads, struct ref **to_fetch) { struct helper_data *data = transport->data; int i, count; if (process_connect(transport, 0)) { do_take_over(transport); - return transport->vtable->fetch(transport, nr_heads, to_fetch, - fetched_refs); + return transport->vtable->fetch(transport, nr_heads, to_fetch); } count = 0; |