diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-12-26 11:42:05 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-12-26 11:42:05 +0900 |
| commit | 7124e36ec7308edad495b821c92be9135aa6319e (patch) | |
| tree | 54a032d891ba7e7fd06b847ee647fb7ba9be0a94 /fetch-pack.c | |
| parent | 179547932fb8484a5ab532ef1b56ed8b01946ab5 (diff) | |
| parent | a31cfe32834423c56911705f926077213c5f5f82 (diff) | |
| download | git-7124e36ec7308edad495b821c92be9135aa6319e.tar.gz | |
Merge branch 'jk/server-supports-v2-cleanup'
Code clean-up.
* jk/server-supports-v2-cleanup:
server_supports_v2(): use a separate function for die_on_error
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 998fc2fa1e..04016d1e32 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -1317,15 +1317,15 @@ static void write_fetch_command_and_capabilities(struct strbuf *req_buf, { const char *hash_name; - if (server_supports_v2("fetch", 1)) - packet_buf_write(req_buf, "command=fetch"); - if (server_supports_v2("agent", 0)) + ensure_server_supports_v2("fetch"); + packet_buf_write(req_buf, "command=fetch"); + if (server_supports_v2("agent")) packet_buf_write(req_buf, "agent=%s", git_user_agent_sanitized()); - if (advertise_sid && server_supports_v2("session-id", 0)) + if (advertise_sid && server_supports_v2("session-id")) packet_buf_write(req_buf, "session-id=%s", trace2_session_id()); - if (server_options && server_options->nr && - server_supports_v2("server-option", 1)) { + if (server_options && server_options->nr) { int i; + ensure_server_supports_v2("server-option"); for (i = 0; i < server_options->nr; i++) packet_buf_write(req_buf, "server-option=%s", server_options->items[i].string); |