mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upload-pack: use upload_pack_data writer in receive_needs()

Browse Source 
As we cleanup 'upload-pack.c' by using 'struct upload_pack_data'
more thoroughly, let's use the 'struct packet_writer writer'
field from 'struct upload_pack_data' in receive_needs(),
instead of a local 'struct packet_writer writer' variable.

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-05-15 12:04:48 +02:00
committed by Junio C Hamano
parent d92ae2c090
commit 4ace0283b7
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
upload-pack.c
View File

@ -917,10 +917,8 @@ static void receive_needs(struct upload_pack_data *data,
timestamp_t deepen_since = 0; timestamp_t deepen_since = 0;
int deepen_rev_list = 0; int deepen_rev_list = 0;
int deepen_relative = 0; int deepen_relative = 0;
struct packet_writer writer;
shallow_nr = 0; shallow_nr = 0;
packet_writer_init(&writer, 1);
for (;;) { for (;;) {
struct object *o; struct object *o;
const char *features; const char *features;
@ -978,7 +976,7 @@ static void receive_needs(struct upload_pack_data *data,
o = parse_object(the_repository, &oid_buf); o = parse_object(the_repository, &oid_buf);
if (!o) { if (!o) {
packet_writer_error(&writer, packet_writer_error(&data->writer,
"upload-pack: not our ref %s", "upload-pack: not our ref %s",
oid_to_hex(&oid_buf)); oid_to_hex(&oid_buf));
die("git upload-pack: not our ref %s", die("git upload-pack: not our ref %s",
@ -1001,7 +999,7 @@ static void receive_needs(struct upload_pack_data *data,
* by another process that handled the initial request. * by another process that handled the initial request.
*/ */
if (has_non_tip) if (has_non_tip)
check_non_tip(&data->want_obj, &writer); check_non_tip(&data->want_obj, &data->writer);
if (!use_sideband && daemon_mode) if (!use_sideband && daemon_mode)
no_progress = 1; no_progress = 1;
@ -1009,7 +1007,7 @@ static void receive_needs(struct upload_pack_data *data,
if (depth == 0 && !deepen_rev_list && shallows.nr == 0) if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
return; return;
if (send_shallow_list(&writer, depth, deepen_rev_list, deepen_since, if (send_shallow_list(&data->writer, depth, deepen_rev_list, deepen_since,
&deepen_not, deepen_relative, &shallows, &deepen_not, deepen_relative, &shallows,
&data->want_obj)) &data->want_obj))
packet_flush(1); packet_flush(1);