Skip to content

Commit 4ace028

Browse files
chriscoolgitster
authored andcommitted
upload-pack: use upload_pack_data writer in receive_needs()
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d92ae2c commit 4ace028

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

upload-pack.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -917,10 +917,8 @@ static void receive_needs(struct upload_pack_data *data,
917917
timestamp_t deepen_since = 0;
918918
int deepen_rev_list = 0;
919919
int deepen_relative = 0;
920-
struct packet_writer writer;
921920

922921
shallow_nr = 0;
923-
packet_writer_init(&writer, 1);
924922
for (;;) {
925923
struct object *o;
926924
const char *features;
@@ -978,7 +976,7 @@ static void receive_needs(struct upload_pack_data *data,
978976

979977
o = parse_object(the_repository, &oid_buf);
980978
if (!o) {
981-
packet_writer_error(&writer,
979+
packet_writer_error(&data->writer,
982980
"upload-pack: not our ref %s",
983981
oid_to_hex(&oid_buf));
984982
die("git upload-pack: not our ref %s",
@@ -1001,15 +999,15 @@ static void receive_needs(struct upload_pack_data *data,
1001999
* by another process that handled the initial request.
10021000
*/
10031001
if (has_non_tip)
1004-
check_non_tip(&data->want_obj, &writer);
1002+
check_non_tip(&data->want_obj, &data->writer);
10051003

10061004
if (!use_sideband && daemon_mode)
10071005
no_progress = 1;
10081006

10091007
if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
10101008
return;
10111009

1012-
if (send_shallow_list(&writer, depth, deepen_rev_list, deepen_since,
1010+
if (send_shallow_list(&data->writer, depth, deepen_rev_list, deepen_since,
10131011
&deepen_not, deepen_relative, &shallows,
10141012
&data->want_obj))
10151013
packet_flush(1);

0 commit comments

Comments
 (0)