@matheusbsbs / matheus-bagliano / commits / e15a6b2f8b

promisor-remote: change promisor_remote_reply()'s signature

The `promisor_remote_reply()` function performs two tasks: 1. It uses filter_promisor_remote() to parse the server's "promisor-remote" advertisement and to mark accepted remotes in the repository configuration. 2. It assembles a reply string containing the accepted remote names to send back to the server. In a following commit, the fetch-pack logic will need to trigger the side effect (1) to ensure the repository state is correct, but it will not need to send a reply (2). To avoid assembling a reply string when it is not needed, let's change the signature of promisor_remote_reply(). It will now return `void` and accept a second `char **accepted_out` argument. Only if that argument is not NULL will a reply string be assembled and returned back to the caller via that argument. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Christian Couder committed Feb 16, 2026 at 14:23 UTC e15a6b2f8b9f62206e9d0b2a57a81da19cdcf3de

3 files changed +20 -17

connect.c

+2 -1

@@ -505,7 +505,8 @@ static void send_capabilities(int fd_out, struct packet_reader *reader)

505 reader->hash_algo = &hash_algos[GIT_HASH_SHA1_LEGACY];

506 }

507 if (server_feature_v2("promisor-remote", &promisor_remote_info)) {

508 - char *reply = promisor_remote_reply(promisor_remote_info);

508 + char *reply;

509 + promisor_remote_reply(promisor_remote_info, &reply);

510 if (reply) {

511 packet_write_fmt(fd_out, "promisor-remote=%s", reply);

512 free(reply);

promisor-remote.c

+13 -11

@@ -920,25 +920,27 @@ static void filter_promisor_remote(struct repository *repo,

920 }

921 }

922

923 -char *promisor_remote_reply(const char *info)

923 +void promisor_remote_reply(const char *info, char **accepted_out)

924 {

925 struct strvec accepted = STRVEC_INIT;

926 - struct strbuf reply = STRBUF_INIT;

926

927 filter_promisor_remote(the_repository, &accepted, info);

928

930 - if (!accepted.nr)

931 - return NULL;

932 -

933 - for (size_t i = 0; i < accepted.nr; i++) {

934 - if (i)

935 - strbuf_addch(&reply, ';');

936 - strbuf_addstr_urlencode(&reply, accepted.v[i], allow_unsanitized);

929 + if (accepted_out) {

930 + if (accepted.nr) {

931 + struct strbuf reply = STRBUF_INIT;

932 + for (size_t i = 0; i < accepted.nr; i++) {

933 + if (i)

934 + strbuf_addch(&reply, ';');

935 + strbuf_addstr_urlencode(&reply, accepted.v[i], allow_unsanitized);

936 + }

937 + *accepted_out = strbuf_detach(&reply, NULL);

938 + } else {

939 + *accepted_out = NULL;

940 + }

941 }

942

943 strvec_clear(&accepted);

940 -

941 - return strbuf_detach(&reply, NULL);

944 }

945

946 void mark_promisor_remotes_as_accepted(struct repository *r, const char *remotes)

promisor-remote.h

+5 -5

@@ -49,12 +49,12 @@ char *promisor_remote_info(struct repository *repo);

49 /*

50 * Prepare a reply to a "promisor-remote" advertisement from a server.

51 * Check the value of "promisor.acceptfromserver" and maybe the

52 - * configured promisor remotes, if any, to prepare the reply.

53 - * Return value is NULL if no promisor remote from the server

54 - * is accepted. Otherwise it contains the names of the accepted promisor

55 - * remotes separated by ';'. See gitprotocol-v2(5).

52 + * configured promisor remotes, if any, to prepare the reply. If the

53 + * `accepted_out` argument is not NULL, it is set to either NULL or to

54 + * the names of the accepted promisor remotes separated by ';' if

55 + * any. See gitprotocol-v2(5).

56 */

57 -char *promisor_remote_reply(const char *info);

57 +void promisor_remote_reply(const char *info, char **accepted_out);

59 /*

60 * Set the 'accepted' flag for some promisor remotes. Useful on the