Re: [PATCH 06/26] transport: use get_refs_via_connect to get refs
From: Stefan Beller <hidden>
Date: 2018-01-03 21:20:26
On Tue, Jan 2, 2018 at 4:18 PM, Brandon Williams [off-list ref] wrote:
Remove code duplication and use the existing 'get_refs_via_connect()' function to retrieve a remote's heads in 'fetch_refs_via_pack()' and 'git_transport_push()'. Signed-off-by: Brandon Williams <redacted>
Reviewed-by: Stefan Beller <redacted>
quoted hunk ↗ jump to hunk
--- transport.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)diff --git a/transport.c b/transport.c index fc802260f..8e8779096 100644 --- a/transport.c +++ b/transport.c@@ -230,12 +230,8 @@ static int fetch_refs_via_pack(struct transport *transport, args.cloning = transport->cloning; args.update_shallow = data->options.update_shallow; - if (!data->got_remote_heads) { - connect_setup(transport, 0); - get_remote_heads(data->fd[0], NULL, 0, &refs_tmp, 0, - NULL, &data->shallow); - data->got_remote_heads = 1; - } + if (!data->got_remote_heads) + refs_tmp = get_refs_via_connect(transport, 0); refs = fetch_pack(&args, data->fd, data->conn, refs_tmp ? refs_tmp : transport->remote_refs,@@ -541,14 +537,8 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re struct send_pack_args args; int ret; - if (!data->got_remote_heads) { - struct ref *tmp_refs; - connect_setup(transport, 1); - - get_remote_heads(data->fd[0], NULL, 0, &tmp_refs, REF_NORMAL, - NULL, &data->shallow); - data->got_remote_heads = 1; - } + if (!data->got_remote_heads) + get_refs_via_connect(transport, 1); memset(&args, 0, sizeof(args)); args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); --2.15.1.620.gb9897f4670-goog