Commit 0f804b0b authored by Jeff King's avatar Jeff King Committed by Junio C Hamano

fetch_pack(): drop unused parameters

We don't need the caller of fetch_pack() to pass in "dest", which is the
remote URL. Since ba227857 (Reduce the number of connects when
fetching, 2008-02-04), the caller is responsible for calling
git_connect() itself, and our "dest" parameter is unused.

That commit also started passing us the resulting "conn" child_process
from git_connect(). But likewise, we do not need do anything with it.
The descriptors in "fd" are enough for us, and the caller is responsible
for cleaning up "conn".

We can just drop both parameters.
Signed-off-by: 's avatarJeff King <peff@peff.net>
Signed-off-by: 's avatarJunio C Hamano <gitster@pobox.com>
parent c5c33504
......@@ -234,7 +234,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
BUG("unknown protocol version");
}
ref = fetch_pack(&args, fd, conn, ref, dest, sought, nr_sought,
ref = fetch_pack(&args, fd, ref, sought, nr_sought,
&shallow, pack_lockfile_ptr, version);
if (pack_lockfile) {
printf("lock %s\n", pack_lockfile);
......
......@@ -1615,9 +1615,8 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
}
struct ref *fetch_pack(struct fetch_pack_args *args,
int fd[], struct child_process *conn,
int fd[],
const struct ref *ref,
const char *dest,
struct ref **sought, int nr_sought,
struct oid_array *shallow,
char **pack_lockfile,
......
......@@ -78,9 +78,8 @@ struct fetch_pack_args {
* marked as such.
*/
struct ref *fetch_pack(struct fetch_pack_args *args,
int fd[], struct child_process *conn,
int fd[],
const struct ref *ref,
const char *dest,
struct ref **sought,
int nr_sought,
struct oid_array *shallow,
......
......@@ -314,7 +314,6 @@ static int fetch_refs_via_pack(struct transport *transport,
int ret = 0;
struct git_transport_data *data = transport->data;
struct ref *refs = NULL;
char *dest = xstrdup(transport->url);
struct fetch_pack_args args;
struct ref *refs_tmp = NULL;
......@@ -356,16 +355,16 @@ static int fetch_refs_via_pack(struct transport *transport,
switch (data->version) {
case protocol_v2:
refs = fetch_pack(&args, data->fd, data->conn,
refs = fetch_pack(&args, data->fd,
refs_tmp ? refs_tmp : transport->remote_refs,
dest, to_fetch, nr_heads, &data->shallow,
to_fetch, nr_heads, &data->shallow,
&transport->pack_lockfile, data->version);
break;
case protocol_v1:
case protocol_v0:
refs = fetch_pack(&args, data->fd, data->conn,
refs = fetch_pack(&args, data->fd,
refs_tmp ? refs_tmp : transport->remote_refs,
dest, to_fetch, nr_heads, &data->shallow,
to_fetch, nr_heads, &data->shallow,
&transport->pack_lockfile, data->version);
break;
case protocol_unknown_version:
......@@ -389,7 +388,6 @@ static int fetch_refs_via_pack(struct transport *transport,
free_refs(refs_tmp);
free_refs(refs);
free(dest);
return ret;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment