Skip to content
  • Ævar Arnfjörð Bjarmason's avatar
    serve.[ch]: remove "serve_options", split up --advertise-refs code · f234da80
    Ævar Arnfjörð Bjarmason authored and Junio C Hamano's avatar Junio C Hamano committed
    The "advertise capabilities" mode of serve.c added in
    ed10cb95 (serve: introduce git-serve, 2018-03-15) is only used by
    the http-backend.c to call {upload,receive}-pack with the
    --advertise-refs parameter. See 42526b47 (Add stateless RPC options
    to upload-pack, receive-pack, 2009-10-30).
    
    Let's just make cmd_upload_pack() take the two (v2) or three (v2)
    parameters the the v2/v1 servicing functions need directly, and pass
    those in via the function signature. The logic of whether daemon mode
    is implied by the timeout belongs in the v1 function (only used
    there).
    
    Once we split up the "advertise v2 refs" from "serve v2 request" it
    becomes clear that v2 never cared about those in combination. The only
    time it mattered was for v1 to emit its ref advertisement, in that
    case we wanted to emit the smart-http-only "no-done" capability.
    
    Since we only do that in the --advertise-refs codepath let's just have
    it set "do_done" itself in v1's upload_pack() just before send_ref(),
    at that point --advertise-refs and --stateless-rpc in combination are
    redundant (the only user is get_info_refs() in http-backend.c), so we
    can just pass in --advertise-refs only.
    
    Since we need to touch all the serve() and advertise_capabilities()
    codepaths let's rename them to less clever and obvious names, it's
    been suggested numerous times, the latest of which is [1]'s suggestion
    for protocol_v2_serve_loop(). Let's go with that.
    
    1. https://lore.kernel.org/git/CAFQ2z_NyGb8rju5CKzmo6KhZXD0Dp21u-BbyCb2aNxLEoSPRJw@mail.gmail.com/
    
    
    
    Signed-off-by: default avatarÆvar Arnfjörð Bjarmason <avarab@gmail.com>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    f234da80