kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

http: extract http_reauth_prepare() from retry paths 

All three HTTP retry paths (http_request_recoverable, post_rpc,
probe_rpc) call credential_fill() directly when handling
HTTP_REAUTH. Extract this into a helper function so that a
subsequent commit can add pre-fill logic (such as attempting
empty-auth before prompting) in one place.

No functional change.

Signed-off-by: Matthew John Cheetham <mjcheetham@outlook.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Matthew John Cheetham 2026-04-16 09:20:57 +00:00 committed by Junio C Hamano
parent f65aba1e87
commit a8faa7a560
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
http.c
View File

@ -665,6 +665,11 @@ static void init_curl_http_auth(CURL *result)
}
}

void http_reauth_prepare(int all_capabilities)
{
credential_fill(the_repository, &http_auth, all_capabilities);
}

/* *var must be free-able */
static void var_override(char **var, char *value)
{
@ -2398,7 +2403,7 @@ static int http_request_recoverable(const char *url,
sleep(retry_delay);
}
} else if (ret == HTTP_REAUTH) {
credential_fill(the_repository, &http_auth, 1);
http_reauth_prepare(1);
}

ret = http_request(url, result, target, options);

6
http.h
View File

@ -76,6 +76,12 @@ extern int http_is_verbose;
extern ssize_t http_post_buffer;
extern struct credential http_auth;

/**
* Prepare for an HTTP re-authentication retry. This fills credentials
* via credential_fill() so the next request can include them.
*/
void http_reauth_prepare(int all_capabilities);

extern char curl_errorstr[CURL_ERROR_SIZE];

enum http_follow_config {

4
remote-curl.c
View File

@ -946,7 +946,7 @@ static int post_rpc(struct rpc_state *rpc, int stateless_connect, int flush_rece
do {
err = probe_rpc(rpc, &results);
if (err == HTTP_REAUTH)
credential_fill(the_repository, &http_auth, 0);
http_reauth_prepare(0);
} while (err == HTTP_REAUTH);
if (err != HTTP_OK)
return -1;
@ -1068,7 +1068,7 @@ retry:
rpc->any_written = 0;
err = run_slot(slot, NULL);
if (err == HTTP_REAUTH && !large_request) {
credential_fill(the_repository, &http_auth, 0);
http_reauth_prepare(0);
curl_slist_free_all(headers);
goto retry;
}