On 2020.10.31 21:04, Ramsay Jones wrote:
>
> Signed-off-by: Ramsay Jones <ramsay@xxxxxxxxxxxxxxxxxxxx>
> ---
>
> Hi Josh,
>
> If you need to re-roll your 'js/trace2-session-id' branch, could you please
> squash this into the relevant patch (commit edb21a501e, "upload-pack, serve:
> log received client trace2 SID", 29-10-2020).
>
> Thanks!
>
> ATB,
> Ramsay Jones
Fixed in V2, thanks!
> upload-pack.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/upload-pack.c b/upload-pack.c
> index b7d097bf1b..2996b8083c 100644
> --- a/upload-pack.c
> +++ b/upload-pack.c
> @@ -1111,7 +1111,7 @@ static void receive_needs(struct upload_pack_data *data,
> if (data->allow_filter &&
> parse_feature_request(features, "filter"))
> data->filter_capability_requested = 1;
> - if ((arg = parse_feature_value(features, "trace2-sid", &feature_len, 0)))
> + if ((arg = parse_feature_value(features, "trace2-sid", &feature_len, NULL)))
> {
> char *client_sid = xstrndup(arg, feature_len);
> trace2_data_string("trace2", NULL, "client-sid", client_sid);
> --
> 2.29.0
