Jonathan Tan <[email protected]> writes:
> When "ACK %s ready" is received, find_common() clears rev_list in an
> attempt to stop further "have" lines from being sent [1]. It is much
> more readable to explicitly break from the loop instead.
>
> So explicitly break from the loop, and make the clearing of the rev_list
> happen unconditionally.
>
> [1] The rationale is further described in the originating commit
> f2cba9299b ("fetch-pack: Finish negotation if remote replies "ACK %s
> ready"", 2011-03-14).
>
> Signed-off-by: Jonathan Tan <[email protected]>
> ---
> fetch-pack.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
This makes more sense to me; I was wondering where the prio-queue
gets cleared, or leaking it is OK, while reading the previous round.
Thanks.
> diff --git a/fetch-pack.c b/fetch-pack.c
> index 2812499a5..60adfc073 100644
> --- a/fetch-pack.c
> +++ b/fetch-pack.c
> @@ -517,10 +517,8 @@ static int find_common(struct fetch_pack_args *args,
> mark_common(commit, 0, 1);
> retval = 0;
> got_continue = 1;
> - if (ack == ACK_ready) {
> - clear_prio_queue(&rev_list);
> + if (ack == ACK_ready)
> got_ready = 1;
> - }
> break;
> }
> }
> @@ -530,6 +528,8 @@ static int find_common(struct fetch_pack_args *args,
> print_verbose(args, _("giving up"));
> break; /* give up */
> }
> + if (got_ready)
> + break;
> }
> }
> done:
> @@ -1096,6 +1096,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args
> *args,
> die(_("git fetch-pack: fetch failed."));
>
> all_done:
> + clear_prio_queue(&rev_list);
> return ref;
> }
>
> @@ -1300,7 +1301,6 @@ static int process_acks(struct packet_reader *reader,
> struct oidset *common)
> }
>
> if (!strcmp(reader->line, "ready")) {
> - clear_prio_queue(&rev_list);
> received_ready = 1;
> continue;
> }
> @@ -1441,6 +1441,7 @@ static struct ref *do_fetch_pack_v2(struct
> fetch_pack_args *args,
> }
> }
>
> + clear_prio_queue(&rev_list);
> oidset_clear(&common);
> return ref;
> }
