fetch-pack: drop the static advertise_sid variable

write_fetch_command_and_capabilities() is moved to 'connect.c' in a
subsequent commit. To prepare for that, drop the static variable usage
of advertise_sid.

Currently advertise_sid is set in fetch_pack_config() by reading
"transfer.advertisesid". It is used in three places:

1. In do_fetch_pack(), to clear it when the server lacks support:

        if (!server_supports("session-id"))
               advertise_sid = 0;

2. In find_common(), to advertise the session id over protocol v0/v1:

        if (advertise_sid)
                strbuf_addf(&c, " session-id=%s", trace2_session_id());

3. In write_fetch_command_and_capabilities(), to advertise it over
   protocol v2:

        if (advertise_sid && server_supports_v2("session-id"))
                packet_buf_write(req_buf, "session-id=%s", trace2_session_id());

About 1, the check only guards the v0/v1 path, and the v2 path
already checks server support inline in its condition. Follow the
same pattern and fold the check into the condition in find_common().

About 2 and 3, replace the static variable with a local read via
repo_config_get_bool() in each function.

Because repo_config_get_bool() leaves advertise_sid as is if it is not
set, initialize it to 0, matching its default.

Helped-by: Jonathan Tan <jonathantanmy@google.com>
Helped-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Calvin Wan <calvinwan@google.com>
Signed-off-by: Eric Ju <eric.peijian@gmail.com>
Signed-off-by: Pablo Sabater <pabloosabaterr@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/fetch-pack.c b/fetch-pack.c
index 9eb8fc539986b7bd6e1fd03ad3e3291fbdaf373c..65ebfec09fc62df11846d7be1a8740262e48b2b4 100644 (file)
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -49,7 +49,6 @@ static int fetch_fsck_objects = -1;
 static int transfer_fsck_objects = -1;
 static int agent_supported;
 static int server_supports_filtering;
-static int advertise_sid;
 static struct shallow_lock shallow_lock;
 static const char *alternate_shallow_file;
 static struct strbuf fsck_msg_types = STRBUF_INIT;
@@ -363,6 +362,9 @@ static int find_common(struct fetch_negotiator *negotiator,
        size_t state_len = 0;
        struct packet_reader reader;
        struct oidset negotiation_include_oids = OIDSET_INIT;
+       int advertise_sid = 0;
+
+       repo_config_get_bool(the_repository, "transfer.advertisesid", &advertise_sid);
 
        if (args->stateless_rpc && multi_ack == 1)
                die(_("the option '%s' requires '%s'"), "--stateless-rpc", "multi_ack_detailed");
@@ -414,7 +416,7 @@ static int find_common(struct fetch_negotiator *negotiator,
                        if (deepen_not_ok)      strbuf_addstr(&c, " deepen-not");
                        if (agent_supported)    strbuf_addf(&c, " agent=%s",
                                                            git_user_agent_sanitized());
-                       if (advertise_sid)
+                       if (advertise_sid && server_supports("session-id"))
                                strbuf_addf(&c, " session-id=%s", trace2_session_id());
                        if (args->filter_options.choice)
                                strbuf_addstr(&c, " filter");
@@ -1160,9 +1162,6 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
                                      (int)agent_len, agent_feature);
        }
 
-       if (!server_supports("session-id"))
-               advertise_sid = 0;
-
        if (server_supports("shallow"))
                print_verbose(args, _("Server supports %s"), "shallow");
        else if (args->depth > 0 || is_repository_shallow(r))
@@ -1380,6 +1379,9 @@ static void write_fetch_command_and_capabilities(struct strbuf *req_buf,
                                                 const struct string_list *server_options)
 {
        const char *hash_name;
+       int advertise_sid = 0;
+
+       repo_config_get_bool(the_repository, "transfer.advertisesid", &advertise_sid);
 
        ensure_server_supports_v2("fetch");
        packet_buf_write(req_buf, "command=fetch");
@@ -1998,7 +2000,6 @@ static void fetch_pack_config(void)
        repo_config_get_bool(the_repository, "repack.usedeltabaseoffset", &prefer_ofs_delta);
        repo_config_get_bool(the_repository, "fetch.fsckobjects", &fetch_fsck_objects);
        repo_config_get_bool(the_repository, "transfer.fsckobjects", &transfer_fsck_objects);
-       repo_config_get_bool(the_repository, "transfer.advertisesid", &advertise_sid);
        if (!uri_protocols.nr) {
                char *str;