diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:55 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-02-14 14:15:55 -0800 |
| commit | b7a7af266bdf2796385fb626de059ab7a61a80be (patch) | |
| tree | 6466a10638de49bb3e8a580a194ed9a5d8eada1f /connect.c | |
| parent | 8d404d0d952ed0f09682c9651f82ce7e30eeb819 (diff) | |
| parent | a31cfe32834423c56911705f926077213c5f5f82 (diff) | |
| download | git-b7a7af266bdf2796385fb626de059ab7a61a80be.tar.gz | |
Merge branch 'jk/server-supports-v2-cleanup' into maint-2.39
Code clean-up.
* jk/server-supports-v2-cleanup:
server_supports_v2(): use a separate function for die_on_error
Diffstat (limited to 'connect.c')
| -rw-r--r-- | connect.c | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -66,7 +66,7 @@ static NORETURN void die_initial_contact(int unexpected) } /* Checks if the server supports the capability 'c' */ -int server_supports_v2(const char *c, int die_on_error) +int server_supports_v2(const char *c) { int i; @@ -76,11 +76,13 @@ int server_supports_v2(const char *c, int die_on_error) (!*out || *out == '=')) return 1; } + return 0; +} - if (die_on_error) +void ensure_server_supports_v2(const char *c) +{ + if (!server_supports_v2(c)) die(_("server doesn't support '%s'"), c); - - return 0; } int server_feature_v2(const char *c, const char **v) @@ -477,7 +479,7 @@ static void send_capabilities(int fd_out, struct packet_reader *reader) { const char *hash_name; - if (server_supports_v2("agent", 0)) + if (server_supports_v2("agent")) packet_write_fmt(fd_out, "agent=%s", git_user_agent_sanitized()); if (server_feature_v2("object-format", &hash_name)) { @@ -504,17 +506,18 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader, &transport_options->unborn_head_target : NULL; *list = NULL; - if (server_supports_v2("ls-refs", 1)) - packet_write_fmt(fd_out, "command=ls-refs\n"); + ensure_server_supports_v2("ls-refs"); + packet_write_fmt(fd_out, "command=ls-refs\n"); /* Send capabilities */ send_capabilities(fd_out, reader); - if (server_options && server_options->nr && - server_supports_v2("server-option", 1)) + if (server_options && server_options->nr) { + ensure_server_supports_v2("server-option"); for (i = 0; i < server_options->nr; i++) packet_write_fmt(fd_out, "server-option=%s", server_options->items[i].string); + } packet_delim(fd_out); /* When pushing we don't want to request the peeled tags */ |