global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-10 10:13:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

upload-pack: pass upload_pack_data to send_unshallow()

Browse Source 
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's pass that struct to send_unshallow(), so
that this function can use all the fields of the struct.

This will be used in followup commits to move static variables
into 'upload_pack_data'.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder
2020-06-11 14:05:08 +02:00
committed by Junio C Hamano
parent 446e42c559
commit 329f996050
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
upload-pack.c
View File

@@ -715,17 +715,15 @@ static void send_shallow(struct packet_writer *writer,
} }
} }
static void send_unshallow(struct packet_writer *writer, static void send_unshallow(struct upload_pack_data *data)
const struct object_array *shallows,
struct object_array *want_obj)
{ {
int i; int i;
for (i = 0; i < shallows->nr; i++) { for (i = 0; i < data->shallows.nr; i++) {
struct object *object = shallows->objects[i].item; struct object *object = data->shallows.objects[i].item;
if (object->flags & NOT_SHALLOW) { if (object->flags & NOT_SHALLOW) {
struct commit_list *parents; struct commit_list *parents;
packet_writer_write(writer, "unshallow %s", packet_writer_write(&data->writer, "unshallow %s",
oid_to_hex(&object->oid)); oid_to_hex(&object->oid));
object->flags &= ~CLIENT_SHALLOW; object->flags &= ~CLIENT_SHALLOW;
/* /*
@@ -741,7 +739,7 @@ static void send_unshallow(struct packet_writer *writer,
parents = ((struct commit *)object)->parents; parents = ((struct commit *)object)->parents;
while (parents) { while (parents) {
add_object_array(&parents->item->object, add_object_array(&parents->item->object,
NULL, want_obj); NULL, &data->want_obj);
parents = parents->next; parents = parents->next;
} }
add_object_array(object, NULL, &extra_edge_obj); add_object_array(object, NULL, &extra_edge_obj);
@@ -789,7 +787,7 @@ static void deepen(struct upload_pack_data *data, int depth)
free_commit_list(result); free_commit_list(result);
} }
send_unshallow(&data->writer, &data->shallows, &data->want_obj); send_unshallow(data);
} }
static void deepen_by_rev_list(struct upload_pack_data *data, static void deepen_by_rev_list(struct upload_pack_data *data,
@@ -802,7 +800,7 @@ static void deepen_by_rev_list(struct upload_pack_data *data,
result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW); result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
send_shallow(&data->writer, result); send_shallow(&data->writer, result);
free_commit_list(result); free_commit_list(result);
send_unshallow(&data->writer, &data->shallows, &data->want_obj); send_unshallow(data);
} }
/* Returns 1 if a shallow list is sent or 0 otherwise */ /* Returns 1 if a shallow list is sent or 0 otherwise */