Elijah Newren | d812c3b | 2023-04-11 00:41:56 -0700 | [diff] [blame] | 1 | #include "git-compat-util.h" |
Elijah Newren | 6c6ddf9 | 2023-04-11 03:00:39 +0000 | [diff] [blame] | 2 | #include "advice.h" |
Brandon Williams | b2141fc | 2017-06-14 11:07:36 -0700 | [diff] [blame] | 3 | #include "config.h" |
Elijah Newren | 32a8f51 | 2023-03-21 06:26:03 +0000 | [diff] [blame] | 4 | #include "environment.h" |
Elijah Newren | 41771fa | 2023-02-24 00:09:27 +0000 | [diff] [blame] | 5 | #include "hex.h" |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 6 | #include "transport.h" |
Ævar Arnfjörð Bjarmason | 5e3aba3 | 2021-09-26 21:03:26 +0200 | [diff] [blame] | 7 | #include "hook.h" |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 8 | #include "pkt-line.h" |
| 9 | #include "fetch-pack.h" |
Junio C Hamano | 47a5918 | 2013-07-08 13:56:53 -0700 | [diff] [blame] | 10 | #include "remote.h" |
| 11 | #include "connect.h" |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 12 | #include "send-pack.h" |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 13 | #include "walker.h" |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 14 | #include "bundle.h" |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 15 | #include "dir.h" |
Elijah Newren | 36bf195 | 2023-02-24 00:09:24 +0000 | [diff] [blame] | 16 | #include "gettext.h" |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 17 | #include "refs.h" |
Brandon Williams | ec0cb49 | 2018-05-16 15:57:48 -0700 | [diff] [blame] | 18 | #include "refspec.h" |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 19 | #include "branch.h" |
Jeff King | 638794c | 2010-05-23 05:17:55 -0400 | [diff] [blame] | 20 | #include "url.h" |
Fredrik Gustafsson | d2b17b3 | 2011-08-20 00:08:47 +0200 | [diff] [blame] | 21 | #include "submodule.h" |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 22 | #include "string-list.h" |
Jeff King | fe299ec | 2020-03-30 10:03:46 -0400 | [diff] [blame] | 23 | #include "oid-array.h" |
Clemens Buchacher | af65f68 | 2015-11-16 09:05:58 +0100 | [diff] [blame] | 24 | #include "sigchain.h" |
Elijah Newren | 74ea5c9 | 2023-04-11 03:00:38 +0000 | [diff] [blame] | 25 | #include "trace2.h" |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 26 | #include "transport-internal.h" |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 27 | #include "protocol.h" |
Elijah Newren | dabab1d | 2023-04-11 00:41:49 -0700 | [diff] [blame] | 28 | #include "object-name.h" |
Elijah Newren | a034e91 | 2023-05-16 06:34:06 +0000 | [diff] [blame] | 29 | #include "object-store-ll.h" |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 30 | #include "color.h" |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 31 | #include "bundle-uri.h" |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 32 | |
| 33 | static int transport_use_color = -1; |
| 34 | static char transport_colors[][COLOR_MAXLEN] = { |
| 35 | GIT_COLOR_RESET, |
| 36 | GIT_COLOR_RED /* REJECTED */ |
| 37 | }; |
| 38 | |
| 39 | enum color_transport { |
| 40 | TRANSPORT_COLOR_RESET = 0, |
| 41 | TRANSPORT_COLOR_REJECTED = 1 |
| 42 | }; |
| 43 | |
| 44 | static int transport_color_config(void) |
| 45 | { |
| 46 | const char *keys[] = { |
| 47 | "color.transport.reset", |
| 48 | "color.transport.rejected" |
| 49 | }, *key = "color.transport"; |
| 50 | char *value; |
| 51 | int i; |
| 52 | static int initialized; |
| 53 | |
| 54 | if (initialized) |
| 55 | return 0; |
| 56 | initialized = 1; |
| 57 | |
| 58 | if (!git_config_get_string(key, &value)) |
| 59 | transport_use_color = git_config_colorbool(key, value); |
| 60 | |
| 61 | if (!want_color_stderr(transport_use_color)) |
| 62 | return 0; |
| 63 | |
| 64 | for (i = 0; i < ARRAY_SIZE(keys); i++) |
| 65 | if (!git_config_get_string(keys[i], &value)) { |
| 66 | if (!value) |
| 67 | return config_error_nonbool(keys[i]); |
| 68 | if (color_parse(value, transport_colors[i]) < 0) |
| 69 | return -1; |
| 70 | } |
| 71 | |
| 72 | return 0; |
| 73 | } |
| 74 | |
| 75 | static const char *transport_get_color(enum color_transport ix) |
| 76 | { |
| 77 | if (want_color_stderr(transport_use_color)) |
| 78 | return transport_colors[ix]; |
| 79 | return ""; |
| 80 | } |
Johannes Schindelin | cd547b4 | 2007-10-01 00:59:39 +0100 | [diff] [blame] | 81 | |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 82 | static void set_upstreams(struct transport *transport, struct ref *refs, |
| 83 | int pretend) |
| 84 | { |
| 85 | struct ref *ref; |
| 86 | for (ref = refs; ref; ref = ref->next) { |
| 87 | const char *localname; |
| 88 | const char *tmp; |
| 89 | const char *remotename; |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 90 | int flag = 0; |
| 91 | /* |
| 92 | * Check suitability for tracking. Must be successful / |
| 93 | * already up-to-date ref create/modify (not delete). |
| 94 | */ |
| 95 | if (ref->status != REF_STATUS_OK && |
| 96 | ref->status != REF_STATUS_UPTODATE) |
| 97 | continue; |
| 98 | if (!ref->peer_ref) |
| 99 | continue; |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 100 | if (is_null_oid(&ref->new_oid)) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 101 | continue; |
| 102 | |
| 103 | /* Follow symbolic refs (mainly for HEAD). */ |
| 104 | localname = ref->peer_ref->name; |
| 105 | remotename = ref->name; |
Ronnie Sahlberg | 7695d11 | 2014-07-15 12:59:36 -0700 | [diff] [blame] | 106 | tmp = resolve_ref_unsafe(localname, RESOLVE_REF_READING, |
René Scharfe | 744c040 | 2017-09-23 11:45:04 +0200 | [diff] [blame] | 107 | NULL, &flag); |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 108 | if (tmp && flag & REF_ISSYMREF && |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 109 | starts_with(tmp, "refs/heads/")) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 110 | localname = tmp; |
| 111 | |
| 112 | /* Both source and destination must be local branches. */ |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 113 | if (!localname || !starts_with(localname, "refs/heads/")) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 114 | continue; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 115 | if (!remotename || !starts_with(remotename, "refs/heads/")) |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 116 | continue; |
| 117 | |
Øystein Walle | f3cce89 | 2021-04-15 14:33:53 +0200 | [diff] [blame] | 118 | if (!pretend) { |
| 119 | int flag = transport->verbose < 0 ? 0 : BRANCH_CONFIG_VERBOSE; |
| 120 | install_branch_config(flag, localname + 11, |
| 121 | transport->remote->name, remotename); |
| 122 | } else if (transport->verbose >= 0) |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 123 | printf(_("Would set upstream of '%s' to '%s' of '%s'\n"), |
Ilari Liusvaara | e9fcd1e | 2010-01-16 23:45:31 +0200 | [diff] [blame] | 124 | localname + 11, remotename + 11, |
| 125 | transport->remote->name); |
| 126 | } |
| 127 | } |
| 128 | |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 129 | struct bundle_transport_data { |
| 130 | int fd; |
| 131 | struct bundle_header header; |
Jonathan Tan | fddf2eb | 2019-08-21 15:20:10 -0700 | [diff] [blame] | 132 | unsigned get_refs_from_bundle_called : 1; |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 133 | }; |
| 134 | |
Ævar Arnfjörð Bjarmason | 0f0d118 | 2022-03-04 19:32:10 +0100 | [diff] [blame] | 135 | static void get_refs_from_bundle_inner(struct transport *transport) |
| 136 | { |
| 137 | struct bundle_transport_data *data = transport->data; |
| 138 | |
| 139 | data->get_refs_from_bundle_called = 1; |
| 140 | |
| 141 | if (data->fd > 0) |
| 142 | close(data->fd); |
| 143 | data->fd = read_bundle_header(transport->url, &data->header); |
| 144 | if (data->fd < 0) |
| 145 | die(_("could not read bundle '%s'"), transport->url); |
| 146 | |
| 147 | transport->hash_algo = data->header.hash_algo; |
| 148 | } |
| 149 | |
Brandon Williams | 834cf34 | 2018-03-15 10:31:22 -0700 | [diff] [blame] | 150 | static struct ref *get_refs_from_bundle(struct transport *transport, |
| 151 | int for_push, |
Ævar Arnfjörð Bjarmason | 5cf88fd | 2022-08-25 19:09:48 +0200 | [diff] [blame] | 152 | struct transport_ls_refs_options *transport_options UNUSED) |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 153 | { |
| 154 | struct bundle_transport_data *data = transport->data; |
| 155 | struct ref *result = NULL; |
| 156 | int i; |
| 157 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 158 | if (for_push) |
| 159 | return NULL; |
| 160 | |
Ævar Arnfjörð Bjarmason | 0f0d118 | 2022-03-04 19:32:10 +0100 | [diff] [blame] | 161 | get_refs_from_bundle_inner(transport); |
brian m. carlson | 6161ce7 | 2020-06-19 17:56:00 +0000 | [diff] [blame] | 162 | |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 163 | for (i = 0; i < data->header.references.nr; i++) { |
Ævar Arnfjörð Bjarmason | 10b635b | 2021-07-02 11:57:32 +0200 | [diff] [blame] | 164 | struct string_list_item *e = data->header.references.items + i; |
| 165 | const char *name = e->string; |
Ævar Arnfjörð Bjarmason | 15e7c7d | 2021-07-02 11:57:31 +0200 | [diff] [blame] | 166 | struct ref *ref = alloc_ref(name); |
Ævar Arnfjörð Bjarmason | 10b635b | 2021-07-02 11:57:32 +0200 | [diff] [blame] | 167 | struct object_id *oid = e->util; |
Ævar Arnfjörð Bjarmason | 15e7c7d | 2021-07-02 11:57:31 +0200 | [diff] [blame] | 168 | oidcpy(&ref->old_oid, oid); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 169 | ref->next = result; |
| 170 | result = ref; |
| 171 | } |
| 172 | return result; |
| 173 | } |
| 174 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 175 | static int fetch_refs_from_bundle(struct transport *transport, |
Jeff King | b3edf33 | 2023-03-17 15:17:18 -0400 | [diff] [blame] | 176 | int nr_heads UNUSED, |
| 177 | struct ref **to_fetch UNUSED) |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 178 | { |
| 179 | struct bundle_transport_data *data = transport->data; |
Ævar Arnfjörð Bjarmason | 7366096 | 2021-09-05 09:34:43 +0200 | [diff] [blame] | 180 | struct strvec extra_index_pack_args = STRVEC_INIT; |
brian m. carlson | 6161ce7 | 2020-06-19 17:56:00 +0000 | [diff] [blame] | 181 | int ret; |
Jonathan Tan | fddf2eb | 2019-08-21 15:20:10 -0700 | [diff] [blame] | 182 | |
Ævar Arnfjörð Bjarmason | 7366096 | 2021-09-05 09:34:43 +0200 | [diff] [blame] | 183 | if (transport->progress) |
| 184 | strvec_push(&extra_index_pack_args, "-v"); |
| 185 | |
Jonathan Tan | fddf2eb | 2019-08-21 15:20:10 -0700 | [diff] [blame] | 186 | if (!data->get_refs_from_bundle_called) |
Ævar Arnfjörð Bjarmason | 0f0d118 | 2022-03-04 19:32:10 +0100 | [diff] [blame] | 187 | get_refs_from_bundle_inner(transport); |
brian m. carlson | 6161ce7 | 2020-06-19 17:56:00 +0000 | [diff] [blame] | 188 | ret = unbundle(the_repository, &data->header, data->fd, |
Derrick Stolee | 89bd7fe | 2022-10-12 12:52:37 +0000 | [diff] [blame] | 189 | &extra_index_pack_args, 0); |
brian m. carlson | 6161ce7 | 2020-06-19 17:56:00 +0000 | [diff] [blame] | 190 | transport->hash_algo = data->header.hash_algo; |
| 191 | return ret; |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 192 | } |
| 193 | |
| 194 | static int close_bundle(struct transport *transport) |
| 195 | { |
| 196 | struct bundle_transport_data *data = transport->data; |
| 197 | if (data->fd > 0) |
| 198 | close(data->fd); |
Ævar Arnfjörð Bjarmason | 10b635b | 2021-07-02 11:57:32 +0200 | [diff] [blame] | 199 | bundle_header_release(&data->header); |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 200 | free(data); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 201 | return 0; |
| 202 | } |
| 203 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 204 | struct git_transport_data { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 205 | struct git_transport_options options; |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 206 | struct child_process *conn; |
| 207 | int fd[2]; |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 208 | unsigned finished_handshake : 1; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 209 | enum protocol_version version; |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 210 | struct oid_array extra_have; |
| 211 | struct oid_array shallow; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 212 | }; |
| 213 | |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 214 | static int set_git_option(struct git_transport_options *opts, |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 215 | const char *name, const char *value) |
| 216 | { |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 217 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 218 | opts->uploadpack = value; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 219 | return 0; |
| 220 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 221 | opts->receivepack = value; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 222 | return 0; |
| 223 | } else if (!strcmp(name, TRANS_OPT_THIN)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 224 | opts->thin = !!value; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 225 | return 0; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 226 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 227 | opts->followtags = !!value; |
Shawn O. Pearce | 41fa7d2 | 2008-03-03 22:27:40 -0500 | [diff] [blame] | 228 | return 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 229 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 230 | opts->keep = !!value; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 231 | return 0; |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 232 | } else if (!strcmp(name, TRANS_OPT_UPDATE_SHALLOW)) { |
| 233 | opts->update_shallow = !!value; |
| 234 | return 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 235 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { |
| 236 | if (!value) |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 237 | opts->depth = 0; |
Nguyễn Thái Ngọc Duy | e7622ce | 2012-01-04 17:01:55 +0700 | [diff] [blame] | 238 | else { |
| 239 | char *end; |
| 240 | opts->depth = strtol(value, &end, 0); |
| 241 | if (*end) |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 242 | die(_("transport: invalid depth option '%s'"), value); |
Nguyễn Thái Ngọc Duy | e7622ce | 2012-01-04 17:01:55 +0700 | [diff] [blame] | 243 | } |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 244 | return 0; |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 245 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_SINCE)) { |
| 246 | opts->deepen_since = value; |
| 247 | return 0; |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 248 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_NOT)) { |
| 249 | opts->deepen_not = (const struct string_list *)value; |
| 250 | return 0; |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 251 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_RELATIVE)) { |
| 252 | opts->deepen_relative = !!value; |
| 253 | return 0; |
Jonathan Tan | 88e2f9e | 2017-12-05 16:58:49 +0000 | [diff] [blame] | 254 | } else if (!strcmp(name, TRANS_OPT_FROM_PROMISOR)) { |
| 255 | opts->from_promisor = !!value; |
| 256 | return 0; |
Jeff Hostetler | 640d8b7 | 2017-12-08 15:58:40 +0000 | [diff] [blame] | 257 | } else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) { |
Matthew DeVore | 489fc9e | 2019-06-27 15:54:12 -0700 | [diff] [blame] | 258 | list_objects_filter_die_if_populated(&opts->filter_options); |
Jeff Hostetler | 640d8b7 | 2017-12-08 15:58:40 +0000 | [diff] [blame] | 259 | parse_list_objects_filter(&opts->filter_options, value); |
| 260 | return 0; |
Robert Coup | 3c7bab0 | 2022-03-28 14:02:08 +0000 | [diff] [blame] | 261 | } else if (!strcmp(name, TRANS_OPT_REFETCH)) { |
| 262 | opts->refetch = !!value; |
| 263 | return 0; |
Li Linchao | 4fe788b | 2021-04-01 10:46:59 +0000 | [diff] [blame] | 264 | } else if (!strcmp(name, TRANS_OPT_REJECT_SHALLOW)) { |
| 265 | opts->reject_shallow = !!value; |
| 266 | return 0; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 267 | } |
| 268 | return 1; |
| 269 | } |
| 270 | |
Eric Wong | f3ee9ca | 2016-01-28 22:51:23 +0000 | [diff] [blame] | 271 | static int connect_setup(struct transport *transport, int for_push) |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 272 | { |
| 273 | struct git_transport_data *data = transport->data; |
Eric Wong | f3ee9ca | 2016-01-28 22:51:23 +0000 | [diff] [blame] | 274 | int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 275 | |
| 276 | if (data->conn) |
| 277 | return 0; |
| 278 | |
Eric Wong | c915f11 | 2016-02-03 04:09:14 +0000 | [diff] [blame] | 279 | switch (transport->family) { |
| 280 | case TRANSPORT_FAMILY_ALL: break; |
| 281 | case TRANSPORT_FAMILY_IPV4: flags |= CONNECT_IPV4; break; |
| 282 | case TRANSPORT_FAMILY_IPV6: flags |= CONNECT_IPV6; break; |
| 283 | } |
| 284 | |
Junio C Hamano | 5a277f3 | 2011-09-06 11:06:32 -0700 | [diff] [blame] | 285 | data->conn = git_connect(data->fd, transport->url, |
Jeff King | eaa0fd6 | 2023-03-17 15:08:51 -0400 | [diff] [blame] | 286 | for_push ? |
| 287 | "git-receive-pack" : |
| 288 | "git-upload-pack", |
| 289 | for_push ? |
| 290 | data->options.receivepack : |
| 291 | data->options.uploadpack, |
Eric Wong | f3ee9ca | 2016-01-28 22:51:23 +0000 | [diff] [blame] | 292 | flags); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 293 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 294 | return 0; |
| 295 | } |
| 296 | |
Jonathan Tan | 35eb824 | 2019-04-12 12:51:21 -0700 | [diff] [blame] | 297 | static void die_if_server_options(struct transport *transport) |
| 298 | { |
| 299 | if (!transport->server_options || !transport->server_options->nr) |
| 300 | return; |
| 301 | advise(_("see protocol.version in 'git help config' for more details")); |
| 302 | die(_("server options require protocol version 2 or later")); |
| 303 | } |
| 304 | |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 305 | /* |
| 306 | * Obtains the protocol version from the transport and writes it to |
| 307 | * transport->data->version, first connecting if not already connected. |
| 308 | * |
| 309 | * If the protocol version is one that allows skipping the listing of remote |
| 310 | * refs, and must_list_refs is 0, the listing of remote refs is skipped and |
| 311 | * this function returns NULL. Otherwise, this function returns the list of |
| 312 | * remote refs. |
| 313 | */ |
| 314 | static struct ref *handshake(struct transport *transport, int for_push, |
Jonathan Tan | 3983540 | 2021-02-05 12:48:48 -0800 | [diff] [blame] | 315 | struct transport_ls_refs_options *options, |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 316 | int must_list_refs) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 317 | { |
| 318 | struct git_transport_data *data = transport->data; |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 319 | struct ref *refs = NULL; |
| 320 | struct packet_reader reader; |
Jeff King | 7ce4c8f | 2023-04-14 17:25:20 -0400 | [diff] [blame] | 321 | size_t sid_len; |
Josh Steadmon | 23bf486 | 2020-11-11 15:29:30 -0800 | [diff] [blame] | 322 | const char *server_sid; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 323 | |
Eric Wong | f3ee9ca | 2016-01-28 22:51:23 +0000 | [diff] [blame] | 324 | connect_setup(transport, for_push); |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 325 | |
| 326 | packet_reader_init(&reader, data->fd[0], NULL, 0, |
| 327 | PACKET_READ_CHOMP_NEWLINE | |
Masaya Suzuki | 2d103c3 | 2018-12-29 13:19:15 -0800 | [diff] [blame] | 328 | PACKET_READ_GENTLE_ON_EOF | |
| 329 | PACKET_READ_DIE_ON_ERR_PACKET); |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 330 | |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 331 | data->version = discover_version(&reader); |
| 332 | switch (data->version) { |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 333 | case protocol_v2: |
Josh Steadmon | 23bf486 | 2020-11-11 15:29:30 -0800 | [diff] [blame] | 334 | if (server_feature_v2("session-id", &server_sid)) |
| 335 | trace2_data_string("transfer", NULL, "server-sid", server_sid); |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 336 | if (must_list_refs) |
| 337 | get_remote_refs(data->fd[1], &reader, &refs, for_push, |
Jonathan Tan | 3983540 | 2021-02-05 12:48:48 -0800 | [diff] [blame] | 338 | options, |
Denton Liu | b0df0c1 | 2020-05-19 06:54:00 -0400 | [diff] [blame] | 339 | transport->server_options, |
| 340 | transport->stateless_rpc); |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 341 | break; |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 342 | case protocol_v1: |
| 343 | case protocol_v0: |
Jonathan Tan | 35eb824 | 2019-04-12 12:51:21 -0700 | [diff] [blame] | 344 | die_if_server_options(transport); |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 345 | get_remote_heads(&reader, &refs, |
| 346 | for_push ? REF_NORMAL : 0, |
| 347 | &data->extra_have, |
| 348 | &data->shallow); |
Josh Steadmon | 23bf486 | 2020-11-11 15:29:30 -0800 | [diff] [blame] | 349 | server_sid = server_feature_value("session-id", &sid_len); |
| 350 | if (server_sid) { |
| 351 | char *sid = xstrndup(server_sid, sid_len); |
| 352 | trace2_data_string("transfer", NULL, "server-sid", sid); |
| 353 | free(sid); |
| 354 | } |
Brandon Williams | ad6ac12 | 2018-03-14 11:31:45 -0700 | [diff] [blame] | 355 | break; |
| 356 | case protocol_unknown_version: |
| 357 | BUG("unknown protocol version"); |
| 358 | } |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 359 | data->finished_handshake = 1; |
brian m. carlson | 7c97af4 | 2020-05-25 19:58:55 +0000 | [diff] [blame] | 360 | transport->hash_algo = reader.hash_algo; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 361 | |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 362 | if (reader.line_peeked) |
| 363 | BUG("buffer must be empty at the end of handshake()"); |
| 364 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 365 | return refs; |
| 366 | } |
| 367 | |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 368 | static struct ref *get_refs_via_connect(struct transport *transport, int for_push, |
Jonathan Tan | 3983540 | 2021-02-05 12:48:48 -0800 | [diff] [blame] | 369 | struct transport_ls_refs_options *options) |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 370 | { |
Jonathan Tan | 3983540 | 2021-02-05 12:48:48 -0800 | [diff] [blame] | 371 | return handshake(transport, for_push, options, 1); |
Jonathan Tan | 99bcb88 | 2018-09-27 12:24:04 -0700 | [diff] [blame] | 372 | } |
| 373 | |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 374 | static int get_bundle_uri(struct transport *transport) |
| 375 | { |
| 376 | struct git_transport_data *data = transport->data; |
| 377 | struct packet_reader reader; |
| 378 | int stateless_rpc = transport->stateless_rpc; |
| 379 | |
| 380 | if (!transport->bundles) { |
| 381 | CALLOC_ARRAY(transport->bundles, 1); |
| 382 | init_bundle_list(transport->bundles); |
| 383 | } |
| 384 | |
Ævar Arnfjörð Bjarmason | 70b9c10 | 2022-12-22 15:14:12 +0000 | [diff] [blame] | 385 | if (!data->finished_handshake) { |
| 386 | struct ref *refs = handshake(transport, 0, NULL, 0); |
| 387 | |
| 388 | if (refs) |
| 389 | free_refs(refs); |
| 390 | } |
| 391 | |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 392 | /* |
| 393 | * "Support" protocol v0 and v2 without bundle-uri support by |
| 394 | * silently degrading to a NOOP. |
| 395 | */ |
Junio C Hamano | 0903d8b | 2023-01-02 21:37:18 +0900 | [diff] [blame] | 396 | if (!server_supports_v2("bundle-uri")) |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 397 | return 0; |
| 398 | |
| 399 | packet_reader_init(&reader, data->fd[0], NULL, 0, |
| 400 | PACKET_READ_CHOMP_NEWLINE | |
| 401 | PACKET_READ_GENTLE_ON_EOF); |
| 402 | |
| 403 | return get_remote_bundle_uri(data->fd[1], &reader, |
| 404 | transport->bundles, stateless_rpc); |
| 405 | } |
| 406 | |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 407 | static int fetch_refs_via_pack(struct transport *transport, |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 408 | int nr_heads, struct ref **to_fetch) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 409 | { |
Matt McCutchen | e70a65c | 2017-02-22 11:02:15 -0500 | [diff] [blame] | 410 | int ret = 0; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 411 | struct git_transport_data *data = transport->data; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 412 | struct ref *refs = NULL; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 413 | struct fetch_pack_args args; |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 414 | struct ref *refs_tmp = NULL; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 415 | |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 416 | memset(&args, 0, sizeof(args)); |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 417 | args.uploadpack = data->options.uploadpack; |
| 418 | args.keep_pack = data->options.keep; |
Shawn O. Pearce | fa74052 | 2007-09-19 00:49:35 -0400 | [diff] [blame] | 419 | args.lock_pack = 1; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 420 | args.use_thin_pack = data->options.thin; |
| 421 | args.include_tag = data->options.followtags; |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 422 | args.verbose = (transport->verbose > 1); |
Tuncer Ayaz | fe8aa14 | 2008-10-05 15:53:00 +0200 | [diff] [blame] | 423 | args.quiet = (transport->verbose < 0); |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 424 | args.no_progress = !transport->progress; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 425 | args.depth = data->options.depth; |
Nguyễn Thái Ngọc Duy | 508ea88 | 2016-06-12 17:53:59 +0700 | [diff] [blame] | 426 | args.deepen_since = data->options.deepen_since; |
Nguyễn Thái Ngọc Duy | a45a260 | 2016-06-12 17:54:04 +0700 | [diff] [blame] | 427 | args.deepen_not = data->options.deepen_not; |
Nguyễn Thái Ngọc Duy | cccf74e | 2016-06-12 17:54:09 +0700 | [diff] [blame] | 428 | args.deepen_relative = data->options.deepen_relative; |
Nguyễn Thái Ngọc Duy | c6807a4 | 2013-05-26 08:16:17 +0700 | [diff] [blame] | 429 | args.check_self_contained_and_connected = |
| 430 | data->options.check_self_contained_and_connected; |
Nguyễn Thái Ngọc Duy | beea415 | 2013-12-05 20:02:39 +0700 | [diff] [blame] | 431 | args.cloning = transport->cloning; |
Nguyễn Thái Ngọc Duy | 48d25ca | 2013-12-05 20:02:42 +0700 | [diff] [blame] | 432 | args.update_shallow = data->options.update_shallow; |
Jonathan Tan | 88e2f9e | 2017-12-05 16:58:49 +0000 | [diff] [blame] | 433 | args.from_promisor = data->options.from_promisor; |
Jeff King | 3f0e86a | 2022-09-08 00:57:29 -0400 | [diff] [blame] | 434 | list_objects_filter_copy(&args.filter_options, |
| 435 | &data->options.filter_options); |
Robert Coup | 3c7bab0 | 2022-03-28 14:02:08 +0000 | [diff] [blame] | 436 | args.refetch = data->options.refetch; |
Brandon Williams | edc9caf | 2018-03-15 10:31:34 -0700 | [diff] [blame] | 437 | args.stateless_rpc = transport->stateless_rpc; |
Brandon Williams | 5e3548e | 2018-04-23 15:46:24 -0700 | [diff] [blame] | 438 | args.server_options = transport->server_options; |
Jonathan Tan | 3390e42 | 2018-07-02 15:39:44 -0700 | [diff] [blame] | 439 | args.negotiation_tips = data->options.negotiation_tips; |
Li Linchao | 4fe788b | 2021-04-01 10:46:59 +0000 | [diff] [blame] | 440 | args.reject_shallow_remote = transport->smart_options->reject_shallow; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 441 | |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 442 | if (!data->finished_handshake) { |
Jonathan Tan | 0177565 | 2018-09-27 12:24:05 -0700 | [diff] [blame] | 443 | int i; |
| 444 | int must_list_refs = 0; |
| 445 | for (i = 0; i < nr_heads; i++) { |
| 446 | if (!to_fetch[i]->exact_oid) { |
| 447 | must_list_refs = 1; |
| 448 | break; |
| 449 | } |
| 450 | } |
| 451 | refs_tmp = handshake(transport, 0, NULL, must_list_refs); |
| 452 | } |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 453 | |
Denton Liu | dde72f9 | 2020-05-19 06:53:56 -0400 | [diff] [blame] | 454 | if (data->version == protocol_unknown_version) |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 455 | BUG("unknown protocol version"); |
Denton Liu | dde72f9 | 2020-05-19 06:53:56 -0400 | [diff] [blame] | 456 | else if (data->version <= protocol_v1) |
| 457 | die_if_server_options(transport); |
| 458 | |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 459 | if (data->options.acked_commits) { |
| 460 | if (data->version < protocol_v2) { |
| 461 | warning(_("--negotiate-only requires protocol v2")); |
| 462 | ret = -1; |
| 463 | } else if (!server_supports_feature("fetch", "wait-for-done", 0)) { |
| 464 | warning(_("server does not support wait-for-done")); |
| 465 | ret = -1; |
| 466 | } else { |
| 467 | negotiate_using_fetch(data->options.negotiation_tips, |
| 468 | transport->server_options, |
| 469 | transport->stateless_rpc, |
| 470 | data->fd, |
| 471 | data->options.acked_commits); |
| 472 | ret = 0; |
| 473 | } |
| 474 | goto cleanup; |
| 475 | } |
| 476 | |
Denton Liu | dde72f9 | 2020-05-19 06:53:56 -0400 | [diff] [blame] | 477 | refs = fetch_pack(&args, data->fd, |
| 478 | refs_tmp ? refs_tmp : transport->remote_refs, |
| 479 | to_fetch, nr_heads, &data->shallow, |
Junio C Hamano | 34e849b | 2020-06-25 12:27:47 -0700 | [diff] [blame] | 480 | &transport->pack_lockfiles, data->version); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 481 | |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 482 | data->finished_handshake = 0; |
Nguyễn Thái Ngọc Duy | c6807a4 | 2013-05-26 08:16:17 +0700 | [diff] [blame] | 483 | data->options.self_contained_and_connected = |
| 484 | args.self_contained_and_connected; |
Jonathan Tan | cf1e7c0 | 2018-07-02 15:08:43 -0700 | [diff] [blame] | 485 | data->options.connectivity_checked = args.connectivity_checked; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 486 | |
Junio C Hamano | afe8a90 | 2022-05-02 09:50:37 -0700 | [diff] [blame] | 487 | if (!refs) |
Matt McCutchen | e70a65c | 2017-02-22 11:02:15 -0500 | [diff] [blame] | 488 | ret = -1; |
| 489 | if (report_unmatched_refs(to_fetch, nr_heads)) |
| 490 | ret = -1; |
| 491 | |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 492 | cleanup: |
| 493 | close(data->fd[0]); |
Jeff King | ae1a7ee | 2021-05-19 12:11:05 -0400 | [diff] [blame] | 494 | if (data->fd[1] >= 0) |
| 495 | close(data->fd[1]); |
Jonathan Tan | 9c1e657 | 2021-05-04 14:16:01 -0700 | [diff] [blame] | 496 | if (finish_connect(data->conn)) |
| 497 | ret = -1; |
| 498 | data->conn = NULL; |
| 499 | |
Daniel Barkalow | 00183cb | 2008-02-28 11:10:51 -0500 | [diff] [blame] | 500 | free_refs(refs_tmp); |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 501 | free_refs(refs); |
Jeff King | 3f0e86a | 2022-09-08 00:57:29 -0400 | [diff] [blame] | 502 | list_objects_filter_release(&args.filter_options); |
Matt McCutchen | e70a65c | 2017-02-22 11:02:15 -0500 | [diff] [blame] | 503 | return ret; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 504 | } |
| 505 | |
Jeff King | 481c7a6 | 2009-08-05 16:23:26 -0400 | [diff] [blame] | 506 | static int push_had_errors(struct ref *ref) |
| 507 | { |
| 508 | for (; ref; ref = ref->next) { |
| 509 | switch (ref->status) { |
| 510 | case REF_STATUS_NONE: |
| 511 | case REF_STATUS_UPTODATE: |
| 512 | case REF_STATUS_OK: |
| 513 | break; |
| 514 | default: |
| 515 | return 1; |
| 516 | } |
| 517 | } |
| 518 | return 0; |
| 519 | } |
| 520 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 521 | int transport_refs_pushed(struct ref *ref) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 522 | { |
| 523 | for (; ref; ref = ref->next) { |
| 524 | switch(ref->status) { |
| 525 | case REF_STATUS_NONE: |
| 526 | case REF_STATUS_UPTODATE: |
| 527 | break; |
| 528 | default: |
| 529 | return 1; |
| 530 | } |
| 531 | } |
| 532 | return 0; |
| 533 | } |
| 534 | |
Jiang Xin | 1702ae6 | 2020-08-27 11:45:50 -0400 | [diff] [blame] | 535 | static void update_one_tracking_ref(struct remote *remote, char *refname, |
| 536 | struct object_id *new_oid, int deletion, |
| 537 | int verbose) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 538 | { |
Brandon Williams | 0ad4a5f | 2018-05-16 15:57:49 -0700 | [diff] [blame] | 539 | struct refspec_item rs; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 540 | |
Jacob Keller | 95e7c38 | 2020-08-14 17:25:08 -0700 | [diff] [blame] | 541 | memset(&rs, 0, sizeof(rs)); |
Jiang Xin | 1702ae6 | 2020-08-27 11:45:50 -0400 | [diff] [blame] | 542 | rs.src = refname; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 543 | rs.dst = NULL; |
| 544 | |
| 545 | if (!remote_find_tracking(remote, &rs)) { |
| 546 | if (verbose) |
| 547 | fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst); |
Jiang Xin | 1702ae6 | 2020-08-27 11:45:50 -0400 | [diff] [blame] | 548 | if (deletion) |
Kyle Meyer | 755b49a | 2017-02-20 20:10:32 -0500 | [diff] [blame] | 549 | delete_ref(NULL, rs.dst, NULL, 0); |
Jiang Xin | 1702ae6 | 2020-08-27 11:45:50 -0400 | [diff] [blame] | 550 | else |
| 551 | update_ref("update by push", rs.dst, new_oid, |
brian m. carlson | ae07777 | 2017-10-15 22:06:51 +0000 | [diff] [blame] | 552 | NULL, 0, 0); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 553 | free(rs.dst); |
| 554 | } |
| 555 | } |
| 556 | |
Jiang Xin | 1702ae6 | 2020-08-27 11:45:50 -0400 | [diff] [blame] | 557 | void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose) |
| 558 | { |
| 559 | char *refname; |
| 560 | struct object_id *new_oid; |
| 561 | struct ref_push_report *report; |
| 562 | |
| 563 | if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE) |
| 564 | return; |
| 565 | |
| 566 | report = ref->report; |
| 567 | if (!report) |
| 568 | update_one_tracking_ref(remote, ref->name, &ref->new_oid, |
| 569 | ref->deletion, verbose); |
| 570 | else |
| 571 | for (; report; report = report->next) { |
| 572 | refname = report->ref_name ? (char *)report->ref_name : ref->name; |
| 573 | new_oid = report->new_oid ? report->new_oid : &ref->new_oid; |
| 574 | update_one_tracking_ref(remote, refname, new_oid, |
| 575 | is_null_oid(new_oid), verbose); |
| 576 | } |
| 577 | } |
| 578 | |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 579 | static void print_ref_status(char flag, const char *summary, |
| 580 | struct ref *to, struct ref *from, const char *msg, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 581 | struct ref_push_report *report, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 582 | int porcelain, int summary_width) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 583 | { |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 584 | const char *to_name; |
| 585 | |
| 586 | if (report && report->ref_name) |
| 587 | to_name = report->ref_name; |
| 588 | else |
| 589 | to_name = to->name; |
| 590 | |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 591 | if (porcelain) { |
| 592 | if (from) |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 593 | fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to_name); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 594 | else |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 595 | fprintf(stdout, "%c\t:%s\t", flag, to_name); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 596 | if (msg) |
| 597 | fprintf(stdout, "%s (%s)\n", summary, msg); |
| 598 | else |
| 599 | fprintf(stdout, "%s\n", summary); |
| 600 | } else { |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 601 | const char *red = "", *reset = ""; |
| 602 | if (push_had_errors(to)) { |
| 603 | red = transport_get_color(TRANSPORT_COLOR_REJECTED); |
| 604 | reset = transport_get_color(TRANSPORT_COLOR_RESET); |
| 605 | } |
| 606 | fprintf(stderr, " %s%c %-*s%s ", red, flag, summary_width, |
| 607 | summary, reset); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 608 | if (from) |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 609 | fprintf(stderr, "%s -> %s", |
| 610 | prettify_refname(from->name), |
| 611 | prettify_refname(to_name)); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 612 | else |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 613 | fputs(prettify_refname(to_name), stderr); |
Larry D'Anna | 1965ff7 | 2009-06-22 21:10:01 -0400 | [diff] [blame] | 614 | if (msg) { |
| 615 | fputs(" (", stderr); |
| 616 | fputs(msg, stderr); |
| 617 | fputc(')', stderr); |
| 618 | } |
| 619 | fputc('\n', stderr); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 620 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 621 | } |
| 622 | |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 623 | static void print_ok_ref_status(struct ref *ref, |
| 624 | struct ref_push_report *report, |
| 625 | int porcelain, int summary_width) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 626 | { |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 627 | struct object_id *old_oid; |
| 628 | struct object_id *new_oid; |
| 629 | const char *ref_name; |
| 630 | int forced_update; |
| 631 | |
| 632 | if (report && report->old_oid) |
| 633 | old_oid = report->old_oid; |
| 634 | else |
| 635 | old_oid = &ref->old_oid; |
| 636 | if (report && report->new_oid) |
| 637 | new_oid = report->new_oid; |
| 638 | else |
| 639 | new_oid = &ref->new_oid; |
| 640 | if (report && report->forced_update) |
| 641 | forced_update = report->forced_update; |
| 642 | else |
| 643 | forced_update = ref->forced_update; |
| 644 | if (report && report->ref_name) |
| 645 | ref_name = report->ref_name; |
| 646 | else |
| 647 | ref_name = ref->name; |
| 648 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 649 | if (ref->deletion) |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 650 | print_ref_status('-', "[deleted]", ref, NULL, NULL, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 651 | report, porcelain, summary_width); |
| 652 | else if (is_null_oid(old_oid)) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 653 | print_ref_status('*', |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 654 | (starts_with(ref_name, "refs/tags/") |
Jiang Xin | 917c612 | 2020-08-27 11:45:42 -0400 | [diff] [blame] | 655 | ? "[new tag]" |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 656 | : (starts_with(ref_name, "refs/heads/") |
Jiang Xin | 917c612 | 2020-08-27 11:45:42 -0400 | [diff] [blame] | 657 | ? "[new branch]" |
| 658 | : "[new reference]")), |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 659 | ref, ref->peer_ref, NULL, |
| 660 | report, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 661 | else { |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 662 | struct strbuf quickref = STRBUF_INIT; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 663 | char type; |
| 664 | const char *msg; |
| 665 | |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 666 | strbuf_add_unique_abbrev(&quickref, old_oid, |
René Scharfe | 1eb47f1 | 2016-08-06 17:41:01 +0200 | [diff] [blame] | 667 | DEFAULT_ABBREV); |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 668 | if (forced_update) { |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 669 | strbuf_addstr(&quickref, "..."); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 670 | type = '+'; |
| 671 | msg = "forced update"; |
| 672 | } else { |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 673 | strbuf_addstr(&quickref, ".."); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 674 | type = ' '; |
| 675 | msg = NULL; |
| 676 | } |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 677 | strbuf_add_unique_abbrev(&quickref, new_oid, |
René Scharfe | 1eb47f1 | 2016-08-06 17:41:01 +0200 | [diff] [blame] | 678 | DEFAULT_ABBREV); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 679 | |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 680 | print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 681 | report, porcelain, summary_width); |
Jeff King | bd22d4f | 2015-09-24 17:07:40 -0400 | [diff] [blame] | 682 | strbuf_release(&quickref); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 683 | } |
| 684 | } |
| 685 | |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 686 | static int print_one_push_report(struct ref *ref, const char *dest, int count, |
| 687 | struct ref_push_report *report, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 688 | int porcelain, int summary_width) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 689 | { |
Jeff King | 882d49c | 2016-07-13 19:36:53 -0400 | [diff] [blame] | 690 | if (!count) { |
| 691 | char *url = transport_anonymize_url(dest); |
| 692 | fprintf(porcelain ? stdout : stderr, "To %s\n", url); |
| 693 | free(url); |
| 694 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 695 | |
| 696 | switch(ref->status) { |
| 697 | case REF_STATUS_NONE: |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 698 | print_ref_status('X', "[no match]", ref, NULL, NULL, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 699 | report, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 700 | break; |
| 701 | case REF_STATUS_REJECT_NODELETE: |
| 702 | print_ref_status('!', "[rejected]", ref, NULL, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 703 | "remote does not support deleting refs", |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 704 | report, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 705 | break; |
| 706 | case REF_STATUS_UPTODATE: |
| 707 | print_ref_status('=', "[up to date]", ref, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 708 | ref->peer_ref, NULL, |
| 709 | report, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 710 | break; |
| 711 | case REF_STATUS_REJECT_NONFASTFORWARD: |
| 712 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 713 | "non-fast-forward", |
| 714 | report, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 715 | break; |
Chris Rorvick | dbfeddb | 2012-11-29 19:41:37 -0600 | [diff] [blame] | 716 | case REF_STATUS_REJECT_ALREADY_EXISTS: |
| 717 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 718 | "already exists", |
| 719 | report, porcelain, summary_width); |
Chris Rorvick | dbfeddb | 2012-11-29 19:41:37 -0600 | [diff] [blame] | 720 | break; |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 721 | case REF_STATUS_REJECT_FETCH_FIRST: |
| 722 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 723 | "fetch first", |
| 724 | report, porcelain, summary_width); |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 725 | break; |
| 726 | case REF_STATUS_REJECT_NEEDS_FORCE: |
| 727 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 728 | "needs force", |
| 729 | report, porcelain, summary_width); |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 730 | break; |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 731 | case REF_STATUS_REJECT_STALE: |
| 732 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 733 | "stale info", |
| 734 | report, porcelain, summary_width); |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 735 | break; |
Srinidhi Kaushik | 99a1f9a | 2020-10-03 17:40:44 +0530 | [diff] [blame] | 736 | case REF_STATUS_REJECT_REMOTE_UPDATED: |
| 737 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
| 738 | "remote ref updated since checkout", |
| 739 | report, porcelain, summary_width); |
| 740 | break; |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 741 | case REF_STATUS_REJECT_SHALLOW: |
| 742 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 743 | "new shallow roots not allowed", |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 744 | report, porcelain, summary_width); |
Nguyễn Thái Ngọc Duy | 4820a33 | 2013-12-05 20:02:40 +0700 | [diff] [blame] | 745 | break; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 746 | case REF_STATUS_REMOTE_REJECT: |
| 747 | print_ref_status('!', "[remote rejected]", ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 748 | ref->deletion ? NULL : ref->peer_ref, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 749 | ref->remote_status, |
| 750 | report, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 751 | break; |
| 752 | case REF_STATUS_EXPECTING_REPORT: |
| 753 | print_ref_status('!', "[remote failure]", ref, |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 754 | ref->deletion ? NULL : ref->peer_ref, |
| 755 | "remote failed to report status", |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 756 | report, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 757 | break; |
Ronnie Sahlberg | 4ff17f1 | 2015-01-07 19:23:22 -0800 | [diff] [blame] | 758 | case REF_STATUS_ATOMIC_PUSH_FAILED: |
| 759 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 760 | "atomic push failed", |
| 761 | report, porcelain, summary_width); |
Ronnie Sahlberg | 4ff17f1 | 2015-01-07 19:23:22 -0800 | [diff] [blame] | 762 | break; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 763 | case REF_STATUS_OK: |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 764 | print_ok_ref_status(ref, report, porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 765 | break; |
| 766 | } |
| 767 | |
| 768 | return 1; |
| 769 | } |
| 770 | |
Jiang Xin | 63518a5 | 2020-08-27 11:45:46 -0400 | [diff] [blame] | 771 | static int print_one_push_status(struct ref *ref, const char *dest, int count, |
| 772 | int porcelain, int summary_width) |
| 773 | { |
| 774 | struct ref_push_report *report; |
| 775 | int n = 0; |
| 776 | |
| 777 | if (!ref->report) |
| 778 | return print_one_push_report(ref, dest, count, |
| 779 | NULL, porcelain, summary_width); |
| 780 | |
| 781 | for (report = ref->report; report; report = report->next) |
| 782 | print_one_push_report(ref, dest, count + n++, |
| 783 | report, porcelain, summary_width); |
| 784 | return n; |
| 785 | } |
| 786 | |
Junio C Hamano | db98d9b | 2016-10-21 21:33:06 -0700 | [diff] [blame] | 787 | static int measure_abbrev(const struct object_id *oid, int sofar) |
| 788 | { |
brian m. carlson | dc01505 | 2017-03-26 16:01:24 +0000 | [diff] [blame] | 789 | char hex[GIT_MAX_HEXSZ + 1]; |
Ævar Arnfjörð Bjarmason | d850b7a | 2023-03-28 15:58:46 +0200 | [diff] [blame] | 790 | int w = repo_find_unique_abbrev_r(the_repository, hex, oid, |
| 791 | DEFAULT_ABBREV); |
Junio C Hamano | db98d9b | 2016-10-21 21:33:06 -0700 | [diff] [blame] | 792 | |
| 793 | return (w < sofar) ? sofar : w; |
| 794 | } |
| 795 | |
Junio C Hamano | 11fd66d | 2016-10-21 15:28:07 -0700 | [diff] [blame] | 796 | int transport_summary_width(const struct ref *refs) |
| 797 | { |
Junio C Hamano | db98d9b | 2016-10-21 21:33:06 -0700 | [diff] [blame] | 798 | int maxw = -1; |
| 799 | |
| 800 | for (; refs; refs = refs->next) { |
| 801 | maxw = measure_abbrev(&refs->old_oid, maxw); |
| 802 | maxw = measure_abbrev(&refs->new_oid, maxw); |
| 803 | } |
| 804 | if (maxw < 0) |
| 805 | maxw = FALLBACK_DEFAULT_ABBREV; |
| 806 | return (2 * maxw + 3); |
Junio C Hamano | 11fd66d | 2016-10-21 15:28:07 -0700 | [diff] [blame] | 807 | } |
| 808 | |
Michael Lukashov | f1863d0 | 2010-02-16 23:42:52 +0000 | [diff] [blame] | 809 | void transport_print_push_status(const char *dest, struct ref *refs, |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 810 | int verbose, int porcelain, unsigned int *reject_reasons) |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 811 | { |
| 812 | struct ref *ref; |
| 813 | int n = 0; |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 814 | char *head; |
Junio C Hamano | 11fd66d | 2016-10-21 15:28:07 -0700 | [diff] [blame] | 815 | int summary_width = transport_summary_width(refs); |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 816 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 817 | if (transport_color_config() < 0) |
| 818 | warning(_("could not parse transport.color.* config")); |
| 819 | |
René Scharfe | efbd4fd | 2017-10-01 09:29:03 +0200 | [diff] [blame] | 820 | head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 821 | |
| 822 | if (verbose) { |
| 823 | for (ref = refs; ref; ref = ref->next) |
| 824 | if (ref->status == REF_STATUS_UPTODATE) |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 825 | n += print_one_push_status(ref, dest, n, |
| 826 | porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 827 | } |
| 828 | |
| 829 | for (ref = refs; ref; ref = ref->next) |
| 830 | if (ref->status == REF_STATUS_OK) |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 831 | n += print_one_push_status(ref, dest, n, |
| 832 | porcelain, summary_width); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 833 | |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 834 | *reject_reasons = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 835 | for (ref = refs; ref; ref = ref->next) { |
| 836 | if (ref->status != REF_STATUS_NONE && |
| 837 | ref->status != REF_STATUS_UPTODATE && |
| 838 | ref->status != REF_STATUS_OK) |
Junio C Hamano | 7101e10 | 2016-10-21 14:39:41 -0700 | [diff] [blame] | 839 | n += print_one_push_status(ref, dest, n, |
| 840 | porcelain, summary_width); |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 841 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) { |
Fraser Tweedale | 1d2c14d | 2013-01-31 22:22:51 +1000 | [diff] [blame] | 842 | if (head != NULL && !strcmp(head, ref->name)) |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 843 | *reject_reasons |= REJECT_NON_FF_HEAD; |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 844 | else |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 845 | *reject_reasons |= REJECT_NON_FF_OTHER; |
Chris Rorvick | dbfeddb | 2012-11-29 19:41:37 -0600 | [diff] [blame] | 846 | } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) { |
| 847 | *reject_reasons |= REJECT_ALREADY_EXISTS; |
Junio C Hamano | 75e5c0d | 2013-01-23 13:55:30 -0800 | [diff] [blame] | 848 | } else if (ref->status == REF_STATUS_REJECT_FETCH_FIRST) { |
| 849 | *reject_reasons |= REJECT_FETCH_FIRST; |
| 850 | } else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) { |
| 851 | *reject_reasons |= REJECT_NEEDS_FORCE; |
Srinidhi Kaushik | 3b990aa | 2020-10-03 17:40:45 +0530 | [diff] [blame] | 852 | } else if (ref->status == REF_STATUS_REJECT_REMOTE_UPDATED) { |
| 853 | *reject_reasons |= REJECT_REF_NEEDS_UPDATE; |
Christopher Tiwald | f25950f | 2012-03-20 00:31:33 -0400 | [diff] [blame] | 854 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 855 | } |
Stefan Beller | dc76c7f | 2014-10-20 18:50:44 -0700 | [diff] [blame] | 856 | free(head); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 857 | } |
| 858 | |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 859 | static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) |
Junio C Hamano | f3fa183 | 2007-11-08 15:35:32 -0800 | [diff] [blame] | 860 | { |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 861 | struct git_transport_data *data = transport->data; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 862 | struct send_pack_args args; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 863 | int ret = 0; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 864 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 865 | if (transport_color_config() < 0) |
| 866 | return -1; |
| 867 | |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 868 | if (!data->finished_handshake) |
Brandon Williams | 834cf34 | 2018-03-15 10:31:22 -0700 | [diff] [blame] | 869 | get_refs_via_connect(transport, 1, NULL); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 870 | |
Shawn O. Pearce | de1a2fd | 2009-10-30 17:47:41 -0700 | [diff] [blame] | 871 | memset(&args, 0, sizeof(args)); |
Andy Whitcroft | 94c89ba | 2007-11-09 23:32:25 +0000 | [diff] [blame] | 872 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 873 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 874 | args.use_thin_pack = data->options.thin; |
Tay Ray Chuan | 8afd8dc | 2010-02-24 20:50:24 +0800 | [diff] [blame] | 875 | args.verbose = (transport->verbose > 0); |
| 876 | args.quiet = (transport->verbose < 0); |
Jeff King | d7c411b | 2010-10-17 02:37:03 +0800 | [diff] [blame] | 877 | args.progress = transport->progress; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 878 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 879 | args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); |
Ronnie Sahlberg | d0e8e09 | 2015-01-07 19:23:23 -0800 | [diff] [blame] | 880 | args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC); |
Stefan Beller | f6a4e61 | 2016-07-14 14:49:47 -0700 | [diff] [blame] | 881 | args.push_options = transport->push_options; |
Junio C Hamano | 9be8916 | 2014-08-22 18:15:24 -0700 | [diff] [blame] | 882 | args.url = transport->url; |
Daniel Barkalow | 40cb4fa | 2007-10-29 22:03:42 -0400 | [diff] [blame] | 883 | |
Dave Borowitz | 3026109 | 2015-08-19 11:26:46 -0400 | [diff] [blame] | 884 | if (flags & TRANSPORT_PUSH_CERT_ALWAYS) |
| 885 | args.push_cert = SEND_PACK_PUSH_CERT_ALWAYS; |
| 886 | else if (flags & TRANSPORT_PUSH_CERT_IF_ASKED) |
| 887 | args.push_cert = SEND_PACK_PUSH_CERT_IF_ASKED; |
| 888 | else |
| 889 | args.push_cert = SEND_PACK_PUSH_CERT_NEVER; |
| 890 | |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 891 | switch (data->version) { |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 892 | case protocol_v2: |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 893 | die(_("support for protocol v2 not implemented yet")); |
Brandon Williams | 8f6982b | 2018-03-14 11:31:47 -0700 | [diff] [blame] | 894 | break; |
Brandon Williams | 432e956 | 2018-03-14 11:31:46 -0700 | [diff] [blame] | 895 | case protocol_v1: |
| 896 | case protocol_v0: |
| 897 | ret = send_pack(&args, data->fd, data->conn, remote_refs, |
| 898 | &data->extra_have); |
| 899 | break; |
| 900 | case protocol_unknown_version: |
| 901 | BUG("unknown protocol version"); |
| 902 | } |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 903 | |
| 904 | close(data->fd[1]); |
| 905 | close(data->fd[0]); |
Jiang Xin | 7dcbeaa | 2020-04-17 05:45:32 -0400 | [diff] [blame] | 906 | /* |
| 907 | * Atomic push may abort the connection early and close the pipe, |
| 908 | * which may cause an error for `finish_connect()`. Ignore this error |
| 909 | * for atomic git-push. |
| 910 | */ |
| 911 | if (ret || args.atomic) |
| 912 | finish_connect(data->conn); |
| 913 | else |
| 914 | ret = finish_connect(data->conn); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 915 | data->conn = NULL; |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 916 | data->finished_handshake = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 917 | |
| 918 | return ret; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 919 | } |
| 920 | |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 921 | static int connect_git(struct transport *transport, const char *name, |
| 922 | const char *executable, int fd[2]) |
| 923 | { |
| 924 | struct git_transport_data *data = transport->data; |
| 925 | data->conn = git_connect(data->fd, transport->url, |
Jeff King | eaa0fd6 | 2023-03-17 15:08:51 -0400 | [diff] [blame] | 926 | name, executable, 0); |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 927 | fd[0] = data->fd[0]; |
| 928 | fd[1] = data->fd[1]; |
| 929 | return 0; |
| 930 | } |
| 931 | |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 932 | static int disconnect_git(struct transport *transport) |
| 933 | { |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 934 | struct git_transport_data *data = transport->data; |
| 935 | if (data->conn) { |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 936 | if (data->finished_handshake && !transport->stateless_rpc) |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 937 | packet_flush(data->fd[1]); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 938 | close(data->fd[0]); |
Jeff King | ae1a7ee | 2021-05-19 12:11:05 -0400 | [diff] [blame] | 939 | if (data->fd[1] >= 0) |
| 940 | close(data->fd[1]); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 941 | finish_connect(data->conn); |
| 942 | } |
| 943 | |
Jeff King | dd49699 | 2022-09-08 00:58:11 -0400 | [diff] [blame] | 944 | list_objects_filter_release(&data->options.filter_options); |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 945 | free(data); |
Shawn O. Pearce | f4e9576 | 2007-09-19 00:49:42 -0400 | [diff] [blame] | 946 | return 0; |
| 947 | } |
| 948 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 949 | static struct transport_vtable taken_over_vtable = { |
Ævar Arnfjörð Bjarmason | 1fd8822 | 2021-08-05 03:25:36 +0200 | [diff] [blame] | 950 | .get_refs_list = get_refs_via_connect, |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 951 | .get_bundle_uri = get_bundle_uri, |
Ævar Arnfjörð Bjarmason | 1fd8822 | 2021-08-05 03:25:36 +0200 | [diff] [blame] | 952 | .fetch_refs = fetch_refs_via_pack, |
| 953 | .push_refs = git_transport_push, |
| 954 | .disconnect = disconnect_git |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 955 | }; |
| 956 | |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 957 | void transport_take_over(struct transport *transport, |
| 958 | struct child_process *child) |
| 959 | { |
| 960 | struct git_transport_data *data; |
| 961 | |
| 962 | if (!transport->smart_options) |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 963 | BUG("taking over transport requires non-NULL " |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 964 | "smart_options field."); |
| 965 | |
René Scharfe | ca56dad | 2021-03-13 17:17:22 +0100 | [diff] [blame] | 966 | CALLOC_ARRAY(data, 1); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 967 | data->options = *transport->smart_options; |
| 968 | data->conn = child; |
| 969 | data->fd[0] = data->conn->out; |
| 970 | data->fd[1] = data->conn->in; |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 971 | data->finished_handshake = 0; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 972 | transport->data = data; |
| 973 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 974 | transport->vtable = &taken_over_vtable; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 975 | transport->smart_options = &(data->options); |
Junio C Hamano | b26ed43 | 2013-08-07 15:47:18 -0700 | [diff] [blame] | 976 | |
| 977 | transport->cannot_reuse = 1; |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 978 | } |
| 979 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 980 | static int is_file(const char *url) |
| 981 | { |
| 982 | struct stat buf; |
| 983 | if (stat(url, &buf)) |
| 984 | return 0; |
| 985 | return S_ISREG(buf.st_mode); |
| 986 | } |
| 987 | |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 988 | static int external_specification_len(const char *url) |
| 989 | { |
| 990 | return strchr(url, ':') - url; |
| 991 | } |
| 992 | |
Derrick Stolee | f5adaa5 | 2022-07-19 18:32:17 +0000 | [diff] [blame] | 993 | static const struct string_list *protocol_allow_list(void) |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 994 | { |
| 995 | static int enabled = -1; |
| 996 | static struct string_list allowed = STRING_LIST_INIT_DUP; |
| 997 | |
| 998 | if (enabled < 0) { |
| 999 | const char *v = getenv("GIT_ALLOW_PROTOCOL"); |
| 1000 | if (v) { |
| 1001 | string_list_split(&allowed, v, ':', -1); |
| 1002 | string_list_sort(&allowed); |
| 1003 | enabled = 1; |
| 1004 | } else { |
| 1005 | enabled = 0; |
| 1006 | } |
| 1007 | } |
| 1008 | |
| 1009 | return enabled ? &allowed : NULL; |
| 1010 | } |
| 1011 | |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 1012 | enum protocol_allow_config { |
| 1013 | PROTOCOL_ALLOW_NEVER = 0, |
| 1014 | PROTOCOL_ALLOW_USER_ONLY, |
| 1015 | PROTOCOL_ALLOW_ALWAYS |
| 1016 | }; |
| 1017 | |
| 1018 | static enum protocol_allow_config parse_protocol_config(const char *key, |
| 1019 | const char *value) |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 1020 | { |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 1021 | if (!strcasecmp(value, "always")) |
| 1022 | return PROTOCOL_ALLOW_ALWAYS; |
| 1023 | else if (!strcasecmp(value, "never")) |
| 1024 | return PROTOCOL_ALLOW_NEVER; |
| 1025 | else if (!strcasecmp(value, "user")) |
| 1026 | return PROTOCOL_ALLOW_USER_ONLY; |
| 1027 | |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 1028 | die(_("unknown value for config '%s': %s"), key, value); |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 1029 | } |
| 1030 | |
| 1031 | static enum protocol_allow_config get_protocol_config(const char *type) |
| 1032 | { |
| 1033 | char *key = xstrfmt("protocol.%s.allow", type); |
| 1034 | char *value; |
| 1035 | |
| 1036 | /* first check the per-protocol config */ |
| 1037 | if (!git_config_get_string(key, &value)) { |
| 1038 | enum protocol_allow_config ret = |
| 1039 | parse_protocol_config(key, value); |
| 1040 | free(key); |
| 1041 | free(value); |
| 1042 | return ret; |
| 1043 | } |
| 1044 | free(key); |
| 1045 | |
| 1046 | /* if defined, fallback to user-defined default for unknown protocols */ |
| 1047 | if (!git_config_get_string("protocol.allow", &value)) { |
| 1048 | enum protocol_allow_config ret = |
| 1049 | parse_protocol_config("protocol.allow", value); |
| 1050 | free(value); |
| 1051 | return ret; |
| 1052 | } |
| 1053 | |
| 1054 | /* fallback to built-in defaults */ |
| 1055 | /* known safe */ |
| 1056 | if (!strcmp(type, "http") || |
| 1057 | !strcmp(type, "https") || |
| 1058 | !strcmp(type, "git") || |
Taylor Blau | a1d4f67 | 2022-07-29 15:22:13 -0400 | [diff] [blame] | 1059 | !strcmp(type, "ssh")) |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 1060 | return PROTOCOL_ALLOW_ALWAYS; |
| 1061 | |
| 1062 | /* known scary; err on the side of caution */ |
| 1063 | if (!strcmp(type, "ext")) |
| 1064 | return PROTOCOL_ALLOW_NEVER; |
| 1065 | |
| 1066 | /* unknown; by default let them be used only directly by the user */ |
| 1067 | return PROTOCOL_ALLOW_USER_ONLY; |
| 1068 | } |
| 1069 | |
Brandon Williams | a768a02 | 2016-12-14 14:39:54 -0800 | [diff] [blame] | 1070 | int is_transport_allowed(const char *type, int from_user) |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 1071 | { |
Derrick Stolee | f5adaa5 | 2022-07-19 18:32:17 +0000 | [diff] [blame] | 1072 | const struct string_list *allow_list = protocol_allow_list(); |
| 1073 | if (allow_list) |
| 1074 | return string_list_has_string(allow_list, type); |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 1075 | |
| 1076 | switch (get_protocol_config(type)) { |
| 1077 | case PROTOCOL_ALLOW_ALWAYS: |
| 1078 | return 1; |
| 1079 | case PROTOCOL_ALLOW_NEVER: |
| 1080 | return 0; |
| 1081 | case PROTOCOL_ALLOW_USER_ONLY: |
Brandon Williams | a768a02 | 2016-12-14 14:39:54 -0800 | [diff] [blame] | 1082 | if (from_user < 0) |
| 1083 | from_user = git_env_bool("GIT_PROTOCOL_FROM_USER", 1); |
| 1084 | return from_user; |
Brandon Williams | f1762d7 | 2016-12-14 14:39:52 -0800 | [diff] [blame] | 1085 | } |
| 1086 | |
Johannes Schindelin | 033abf9 | 2018-05-02 11:38:39 +0200 | [diff] [blame] | 1087 | BUG("invalid protocol_allow_config type"); |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 1088 | } |
| 1089 | |
Jeff King | a5adace | 2015-09-16 13:12:52 -0400 | [diff] [blame] | 1090 | void transport_check_allowed(const char *type) |
| 1091 | { |
Brandon Williams | a768a02 | 2016-12-14 14:39:54 -0800 | [diff] [blame] | 1092 | if (!is_transport_allowed(type, -1)) |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 1093 | die(_("transport '%s' not allowed"), type); |
Jeff King | 5088d3b | 2015-09-22 18:03:49 -0400 | [diff] [blame] | 1094 | } |
| 1095 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1096 | static struct transport_vtable bundle_vtable = { |
Ævar Arnfjörð Bjarmason | 1fd8822 | 2021-08-05 03:25:36 +0200 | [diff] [blame] | 1097 | .get_refs_list = get_refs_from_bundle, |
| 1098 | .fetch_refs = fetch_refs_from_bundle, |
| 1099 | .disconnect = close_bundle |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1100 | }; |
| 1101 | |
| 1102 | static struct transport_vtable builtin_smart_vtable = { |
Ævar Arnfjörð Bjarmason | 1fd8822 | 2021-08-05 03:25:36 +0200 | [diff] [blame] | 1103 | .get_refs_list = get_refs_via_connect, |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 1104 | .get_bundle_uri = get_bundle_uri, |
Ævar Arnfjörð Bjarmason | 1fd8822 | 2021-08-05 03:25:36 +0200 | [diff] [blame] | 1105 | .fetch_refs = fetch_refs_via_pack, |
| 1106 | .push_refs = git_transport_push, |
| 1107 | .connect = connect_git, |
| 1108 | .disconnect = disconnect_git |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1109 | }; |
| 1110 | |
Shawn O. Pearce | e5f4e21 | 2007-09-15 03:23:14 -0400 | [diff] [blame] | 1111 | struct transport *transport_get(struct remote *remote, const char *url) |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1112 | { |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 1113 | const char *helper; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 1114 | struct transport *ret = xcalloc(1, sizeof(*ret)); |
| 1115 | |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1116 | ret->progress = isatty(2); |
Ævar Arnfjörð Bjarmason | bc40dfb | 2021-07-01 12:51:29 +0200 | [diff] [blame] | 1117 | string_list_init_dup(&ret->pack_lockfiles); |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1118 | |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 1119 | CALLOC_ARRAY(ret->bundles, 1); |
| 1120 | init_bundle_list(ret->bundles); |
| 1121 | |
Daniel Barkalow | c1d45cf | 2009-11-03 21:38:51 -0500 | [diff] [blame] | 1122 | if (!remote) |
Nguyễn Thái Ngọc Duy | 1a07e59 | 2018-07-21 09:49:19 +0200 | [diff] [blame] | 1123 | BUG("No remote provided to transport_get()"); |
Daniel Barkalow | c1d45cf | 2009-11-03 21:38:51 -0500 | [diff] [blame] | 1124 | |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 1125 | ret->got_remote_refs = 0; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 1126 | ret->remote = remote; |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 1127 | helper = remote->foreign_vcs; |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 1128 | |
Junio C Hamano | cb21d8f | 2010-01-27 12:22:37 -0800 | [diff] [blame] | 1129 | if (!url && remote->url) |
Daniel Barkalow | fb0cc87 | 2009-11-18 02:42:22 +0100 | [diff] [blame] | 1130 | url = remote->url[0]; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 1131 | ret->url = url; |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 1132 | |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 1133 | /* maybe it is a foreign URL? */ |
| 1134 | if (url) { |
| 1135 | const char *p = url; |
| 1136 | |
Jeff King | 638794c | 2010-05-23 05:17:55 -0400 | [diff] [blame] | 1137 | while (is_urlschemechar(p == url, *p)) |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 1138 | p++; |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1139 | if (starts_with(p, "::")) |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 1140 | helper = xstrndup(url, p - url); |
Johannes Schindelin | 8742243 | 2009-11-18 02:42:26 +0100 | [diff] [blame] | 1141 | } |
| 1142 | |
Ilari Liusvaara | 4da5046 | 2010-01-27 19:53:17 +0200 | [diff] [blame] | 1143 | if (helper) { |
| 1144 | transport_helper_init(ret, helper); |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1145 | } else if (starts_with(url, "rsync:")) { |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 1146 | die(_("git-over-rsync is no longer supported")); |
Torsten Bögershausen | c59ab2e | 2013-11-28 20:50:03 +0100 | [diff] [blame] | 1147 | } else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) { |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 1148 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); |
Ævar Arnfjörð Bjarmason | 10b635b | 2021-07-02 11:57:32 +0200 | [diff] [blame] | 1149 | bundle_header_init(&data->header); |
Jeff King | a5adace | 2015-09-16 13:12:52 -0400 | [diff] [blame] | 1150 | transport_check_allowed("file"); |
Johannes Schindelin | c7a8a16 | 2007-09-10 23:03:21 -0400 | [diff] [blame] | 1151 | ret->data = data; |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1152 | ret->vtable = &bundle_vtable; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 1153 | ret->smart_options = NULL; |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 1154 | } else if (!is_url(url) |
Christian Couder | 5955654 | 2013-11-30 21:55:40 +0100 | [diff] [blame] | 1155 | || starts_with(url, "file://") |
| 1156 | || starts_with(url, "git://") |
| 1157 | || starts_with(url, "ssh://") |
Carlos Martín Nieto | 07c7782 | 2016-02-15 15:29:06 +0100 | [diff] [blame] | 1158 | || starts_with(url, "git+ssh://") /* deprecated - do not use */ |
| 1159 | || starts_with(url, "ssh+git://") /* deprecated - do not use */ |
| 1160 | ) { |
Jeff King | a5adace | 2015-09-16 13:12:52 -0400 | [diff] [blame] | 1161 | /* |
| 1162 | * These are builtin smart transports; "allowed" transports |
| 1163 | * will be checked individually in git_connect. |
| 1164 | */ |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1165 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); |
Jeff King | 2a01bde | 2022-09-11 01:03:07 -0400 | [diff] [blame] | 1166 | list_objects_filter_init(&data->options.filter_options); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1167 | ret->data = data; |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1168 | ret->vtable = &builtin_smart_vtable; |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 1169 | ret->smart_options = &(data->options); |
Shawn O. Pearce | 824d577 | 2007-09-19 00:49:31 -0400 | [diff] [blame] | 1170 | |
Daniel Barkalow | ba22785 | 2008-02-04 13:26:23 -0500 | [diff] [blame] | 1171 | data->conn = NULL; |
Derrick Stolee | 1b759e0 | 2022-12-22 15:14:11 +0000 | [diff] [blame] | 1172 | data->finished_handshake = 0; |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 1173 | } else { |
| 1174 | /* Unknown protocol in URL. Pass to external handler. */ |
| 1175 | int len = external_specification_len(url); |
René Scharfe | 6b33894 | 2014-12-24 01:18:31 +0100 | [diff] [blame] | 1176 | char *handler = xmemdupz(url, len); |
Ilari Liusvaara | 25d5cc4 | 2009-12-09 17:26:29 +0200 | [diff] [blame] | 1177 | transport_helper_init(ret, handler); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1178 | } |
Shawn O. Pearce | 8eb554a | 2007-09-15 03:23:07 -0400 | [diff] [blame] | 1179 | |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 1180 | if (ret->smart_options) { |
| 1181 | ret->smart_options->thin = 1; |
| 1182 | ret->smart_options->uploadpack = "git-upload-pack"; |
| 1183 | if (remote->uploadpack) |
| 1184 | ret->smart_options->uploadpack = remote->uploadpack; |
| 1185 | ret->smart_options->receivepack = "git-receive-pack"; |
| 1186 | if (remote->receivepack) |
| 1187 | ret->smart_options->receivepack = remote->receivepack; |
| 1188 | } |
| 1189 | |
brian m. carlson | 7c97af4 | 2020-05-25 19:58:55 +0000 | [diff] [blame] | 1190 | ret->hash_algo = &hash_algos[GIT_HASH_SHA1]; |
| 1191 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1192 | return ret; |
| 1193 | } |
| 1194 | |
brian m. carlson | 7c97af4 | 2020-05-25 19:58:55 +0000 | [diff] [blame] | 1195 | const struct git_hash_algo *transport_get_hash_algo(struct transport *transport) |
| 1196 | { |
| 1197 | return transport->hash_algo; |
| 1198 | } |
| 1199 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1200 | int transport_set_option(struct transport *transport, |
| 1201 | const char *name, const char *value) |
| 1202 | { |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 1203 | int git_reports = 1, protocol_reports = 1; |
| 1204 | |
| 1205 | if (transport->smart_options) |
| 1206 | git_reports = set_git_option(transport->smart_options, |
| 1207 | name, value); |
| 1208 | |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1209 | if (transport->vtable->set_option) |
| 1210 | protocol_reports = transport->vtable->set_option(transport, |
| 1211 | name, value); |
Ilari Liusvaara | aa5af97 | 2009-12-09 17:26:30 +0200 | [diff] [blame] | 1212 | |
| 1213 | /* If either report is 0, report 0 (success). */ |
| 1214 | if (!git_reports || !protocol_reports) |
| 1215 | return 0; |
| 1216 | /* If either reports -1 (invalid value), report -1. */ |
| 1217 | if ((git_reports == -1) || (protocol_reports == -1)) |
| 1218 | return -1; |
| 1219 | /* Otherwise if both report unknown, report unknown. */ |
Shawn O. Pearce | ab865e6 | 2007-09-18 04:54:57 -0400 | [diff] [blame] | 1220 | return 1; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1221 | } |
| 1222 | |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1223 | void transport_set_verbosity(struct transport *transport, int verbosity, |
| 1224 | int force_progress) |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 1225 | { |
Jeff King | bd2c86e | 2011-12-17 04:37:15 -0500 | [diff] [blame] | 1226 | if (verbosity >= 1) |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 1227 | transport->verbose = verbosity <= 3 ? verbosity : 3; |
| 1228 | if (verbosity < 0) |
| 1229 | transport->verbose = -1; |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1230 | |
| 1231 | /** |
| 1232 | * Rules used to determine whether to report progress (processing aborts |
| 1233 | * when a rule is satisfied): |
| 1234 | * |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 1235 | * . Report progress, if force_progress is 1 (ie. --progress). |
| 1236 | * . Don't report progress, if force_progress is 0 (ie. --no-progress). |
| 1237 | * . Don't report progress, if verbosity < 0 (ie. -q/--quiet ). |
| 1238 | * . Report progress if isatty(2) is 1. |
Tay Ray Chuan | d01b3c0 | 2010-02-24 20:50:26 +0800 | [diff] [blame] | 1239 | **/ |
Clemens Buchacher | 01fdc21 | 2012-02-13 21:17:15 +0100 | [diff] [blame] | 1240 | if (force_progress >= 0) |
| 1241 | transport->progress = !!force_progress; |
| 1242 | else |
| 1243 | transport->progress = verbosity >= 0 && isatty(2); |
Tay Ray Chuan | bde873c | 2010-02-24 20:50:23 +0800 | [diff] [blame] | 1244 | } |
| 1245 | |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1246 | static void die_with_unpushed_submodules(struct string_list *needs_pushing) |
| 1247 | { |
| 1248 | int i; |
| 1249 | |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 1250 | fprintf(stderr, _("The following submodule paths contain changes that can\n" |
| 1251 | "not be found on any remote:\n")); |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1252 | for (i = 0; i < needs_pushing->nr; i++) |
Stefan Beller | 5cb5fe4 | 2016-08-23 14:40:08 -0700 | [diff] [blame] | 1253 | fprintf(stderr, " %s\n", needs_pushing->items[i].string); |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 1254 | fprintf(stderr, _("\nPlease try\n\n" |
| 1255 | " git push --recurse-submodules=on-demand\n\n" |
| 1256 | "or cd to the path and use\n\n" |
| 1257 | " git push\n\n" |
| 1258 | "to push them to a remote.\n\n")); |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1259 | |
| 1260 | string_list_clear(needs_pushing, 0); |
| 1261 | |
Vasco Almeida | 7ab1d44 | 2016-06-17 20:20:53 +0000 | [diff] [blame] | 1262 | die(_("Aborting.")); |
Heiko Voigt | a762e51 | 2012-03-29 09:21:23 +0200 | [diff] [blame] | 1263 | } |
| 1264 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1265 | static int run_pre_push_hook(struct transport *transport, |
| 1266 | struct ref *remote_refs) |
| 1267 | { |
| 1268 | int ret = 0, x; |
| 1269 | struct ref *r; |
René Scharfe | d318027 | 2014-08-19 21:09:35 +0200 | [diff] [blame] | 1270 | struct child_process proc = CHILD_PROCESS_INIT; |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1271 | struct strbuf buf; |
Ævar Arnfjörð Bjarmason | 7f14609 | 2021-11-25 23:52:21 +0100 | [diff] [blame] | 1272 | const char *hook_path = find_hook("pre-push"); |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1273 | |
Ævar Arnfjörð Bjarmason | 7f14609 | 2021-11-25 23:52:21 +0100 | [diff] [blame] | 1274 | if (!hook_path) |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1275 | return 0; |
| 1276 | |
Ævar Arnfjörð Bjarmason | 7f14609 | 2021-11-25 23:52:21 +0100 | [diff] [blame] | 1277 | strvec_push(&proc.args, hook_path); |
| 1278 | strvec_push(&proc.args, transport->remote->name); |
| 1279 | strvec_push(&proc.args, transport->url); |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1280 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1281 | proc.in = -1; |
Jeff Hostetler | 6206286 | 2019-02-22 14:25:06 -0800 | [diff] [blame] | 1282 | proc.trace2_hook_name = "pre-push"; |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1283 | |
| 1284 | if (start_command(&proc)) { |
| 1285 | finish_command(&proc); |
| 1286 | return -1; |
| 1287 | } |
| 1288 | |
Clemens Buchacher | af65f68 | 2015-11-16 09:05:58 +0100 | [diff] [blame] | 1289 | sigchain_push(SIGPIPE, SIG_IGN); |
| 1290 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1291 | strbuf_init(&buf, 256); |
| 1292 | |
| 1293 | for (r = remote_refs; r; r = r->next) { |
| 1294 | if (!r->peer_ref) continue; |
| 1295 | if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue; |
Junio C Hamano | 631b5ef | 2013-07-08 14:42:40 -0700 | [diff] [blame] | 1296 | if (r->status == REF_STATUS_REJECT_STALE) continue; |
Srinidhi Kaushik | 99a1f9a | 2020-10-03 17:40:44 +0530 | [diff] [blame] | 1297 | if (r->status == REF_STATUS_REJECT_REMOTE_UPDATED) continue; |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1298 | if (r->status == REF_STATUS_UPTODATE) continue; |
| 1299 | |
| 1300 | strbuf_reset(&buf); |
| 1301 | strbuf_addf( &buf, "%s %s %s %s\n", |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1302 | r->peer_ref->name, oid_to_hex(&r->new_oid), |
| 1303 | r->name, oid_to_hex(&r->old_oid)); |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1304 | |
Clemens Buchacher | af65f68 | 2015-11-16 09:05:58 +0100 | [diff] [blame] | 1305 | if (write_in_full(proc.in, buf.buf, buf.len) < 0) { |
| 1306 | /* We do not mind if a hook does not read all refs. */ |
| 1307 | if (errno != EPIPE) |
| 1308 | ret = -1; |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1309 | break; |
| 1310 | } |
| 1311 | } |
| 1312 | |
| 1313 | strbuf_release(&buf); |
| 1314 | |
| 1315 | x = close(proc.in); |
| 1316 | if (!ret) |
| 1317 | ret = x; |
| 1318 | |
Clemens Buchacher | af65f68 | 2015-11-16 09:05:58 +0100 | [diff] [blame] | 1319 | sigchain_pop(SIGPIPE); |
| 1320 | |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1321 | x = finish_command(&proc); |
| 1322 | if (!ret) |
| 1323 | ret = x; |
| 1324 | |
| 1325 | return ret; |
| 1326 | } |
| 1327 | |
Nguyễn Thái Ngọc Duy | 6c6d5d0 | 2018-11-10 06:48:55 +0100 | [diff] [blame] | 1328 | int transport_push(struct repository *r, |
| 1329 | struct transport *transport, |
Brandon Williams | 306f22d | 2018-05-16 15:58:17 -0700 | [diff] [blame] | 1330 | struct refspec *rs, int flags, |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 1331 | unsigned int *reject_reasons) |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1332 | { |
Frantisek Hrbata | 35919bf | 2022-05-20 14:49:51 +0200 | [diff] [blame] | 1333 | struct ref *remote_refs = NULL; |
| 1334 | struct ref *local_refs = NULL; |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1335 | int match_flags = MATCH_REFS_NONE; |
| 1336 | int verbose = (transport->verbose > 0); |
| 1337 | int quiet = (transport->verbose < 0); |
| 1338 | int porcelain = flags & TRANSPORT_PUSH_PORCELAIN; |
| 1339 | int pretend = flags & TRANSPORT_PUSH_DRY_RUN; |
Frantisek Hrbata | 35919bf | 2022-05-20 14:49:51 +0200 | [diff] [blame] | 1340 | int push_ret, err; |
| 1341 | int ret = -1; |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1342 | struct transport_ls_refs_options transport_options = |
| 1343 | TRANSPORT_LS_REFS_OPTIONS_INIT; |
| 1344 | |
Chris Rorvick | 10643d4 | 2012-11-29 19:41:33 -0600 | [diff] [blame] | 1345 | *reject_reasons = 0; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1346 | |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 1347 | if (transport_color_config() < 0) |
Frantisek Hrbata | 35919bf | 2022-05-20 14:49:51 +0200 | [diff] [blame] | 1348 | goto done; |
Ryan Dammrose | 960786e | 2018-04-21 12:10:00 +0200 | [diff] [blame] | 1349 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1350 | if (!transport->vtable->push_refs) |
Frantisek Hrbata | 35919bf | 2022-05-20 14:49:51 +0200 | [diff] [blame] | 1351 | goto done; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1352 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1353 | local_refs = get_local_heads(); |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1354 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1355 | if (check_push_refs(local_refs, rs) < 0) |
Frantisek Hrbata | 35919bf | 2022-05-20 14:49:51 +0200 | [diff] [blame] | 1356 | goto done; |
Brandon Williams | 5b872ff | 2018-03-15 10:31:26 -0700 | [diff] [blame] | 1357 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1358 | refspec_ref_prefixes(rs, &transport_options.ref_prefixes); |
Brandon Williams | 5b872ff | 2018-03-15 10:31:26 -0700 | [diff] [blame] | 1359 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1360 | trace2_region_enter("transport_push", "get_refs_list", r); |
| 1361 | remote_refs = transport->vtable->get_refs_list(transport, 1, |
| 1362 | &transport_options); |
| 1363 | trace2_region_leave("transport_push", "get_refs_list", r); |
Jeff King | ba928c1 | 2014-03-05 14:04:54 -0500 | [diff] [blame] | 1364 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1365 | transport_ls_refs_options_release(&transport_options); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1366 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1367 | if (flags & TRANSPORT_PUSH_ALL) |
| 1368 | match_flags |= MATCH_REFS_ALL; |
| 1369 | if (flags & TRANSPORT_PUSH_MIRROR) |
| 1370 | match_flags |= MATCH_REFS_MIRROR; |
| 1371 | if (flags & TRANSPORT_PUSH_PRUNE) |
| 1372 | match_flags |= MATCH_REFS_PRUNE; |
| 1373 | if (flags & TRANSPORT_PUSH_FOLLOW_TAGS) |
| 1374 | match_flags |= MATCH_REFS_FOLLOW_TAGS; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1375 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1376 | if (match_push_refs(local_refs, &remote_refs, rs, match_flags)) |
Frantisek Hrbata | 35919bf | 2022-05-20 14:49:51 +0200 | [diff] [blame] | 1377 | goto done; |
Junio C Hamano | 91048a9 | 2013-07-09 11:01:06 -0700 | [diff] [blame] | 1378 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1379 | if (transport->smart_options && |
| 1380 | transport->smart_options->cas && |
| 1381 | !is_empty_cas(transport->smart_options->cas)) |
| 1382 | apply_push_cas(transport->smart_options->cas, |
| 1383 | transport->remote, remote_refs); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1384 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1385 | set_ref_status_for_push(remote_refs, |
| 1386 | flags & TRANSPORT_PUSH_MIRROR, |
| 1387 | flags & TRANSPORT_PUSH_FORCE); |
Aaron Schrab | ec55559 | 2013-01-13 00:17:03 -0500 | [diff] [blame] | 1388 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1389 | if (!(flags & TRANSPORT_PUSH_NO_HOOK)) |
| 1390 | if (run_pre_push_hook(transport, remote_refs)) |
Frantisek Hrbata | 35919bf | 2022-05-20 14:49:51 +0200 | [diff] [blame] | 1391 | goto done; |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1392 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1393 | if ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
| 1394 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && |
| 1395 | !is_bare_repository()) { |
| 1396 | struct ref *ref = remote_refs; |
| 1397 | struct oid_array commits = OID_ARRAY_INIT; |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1398 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1399 | trace2_region_enter("transport_push", "push_submodules", r); |
| 1400 | for (; ref; ref = ref->next) |
| 1401 | if (!is_null_oid(&ref->new_oid)) |
| 1402 | oid_array_append(&commits, |
| 1403 | &ref->new_oid); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1404 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1405 | if (!push_unpushed_submodules(r, |
| 1406 | &commits, |
| 1407 | transport->remote, |
| 1408 | rs, |
| 1409 | transport->push_options, |
| 1410 | pretend)) { |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1411 | oid_array_clear(&commits); |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1412 | trace2_region_leave("transport_push", "push_submodules", r); |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1413 | die(_("failed to push all needed submodules")); |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1414 | } |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1415 | oid_array_clear(&commits); |
| 1416 | trace2_region_leave("transport_push", "push_submodules", r); |
| 1417 | } |
Larry D'Anna | 7755585 | 2010-02-26 23:52:15 -0500 | [diff] [blame] | 1418 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1419 | if (((flags & TRANSPORT_RECURSE_SUBMODULES_CHECK) || |
| 1420 | ((flags & (TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND | |
| 1421 | TRANSPORT_RECURSE_SUBMODULES_ONLY)) && |
| 1422 | !pretend)) && !is_bare_repository()) { |
| 1423 | struct ref *ref = remote_refs; |
| 1424 | struct string_list needs_pushing = STRING_LIST_INIT_DUP; |
| 1425 | struct oid_array commits = OID_ARRAY_INIT; |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1426 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1427 | trace2_region_enter("transport_push", "check_submodules", r); |
| 1428 | for (; ref; ref = ref->next) |
| 1429 | if (!is_null_oid(&ref->new_oid)) |
| 1430 | oid_array_append(&commits, |
| 1431 | &ref->new_oid); |
Heiko Voigt | 9cfa1c2 | 2016-11-16 16:11:05 +0100 | [diff] [blame] | 1432 | |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1433 | if (find_unpushed_submodules(r, |
| 1434 | &commits, |
| 1435 | transport->remote->name, |
| 1436 | &needs_pushing)) { |
brian m. carlson | 910650d | 2017-03-31 01:40:00 +0000 | [diff] [blame] | 1437 | oid_array_clear(&commits); |
Junio C Hamano | 360c7ba | 2019-10-08 13:18:24 +0900 | [diff] [blame] | 1438 | trace2_region_leave("transport_push", "check_submodules", r); |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1439 | die_with_unpushed_submodules(&needs_pushing); |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 1440 | } |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1441 | string_list_clear(&needs_pushing, 0); |
| 1442 | oid_array_clear(&commits); |
| 1443 | trace2_region_leave("transport_push", "check_submodules", r); |
Daniel Barkalow | 64fcef2 | 2009-03-08 21:06:07 -0400 | [diff] [blame] | 1444 | } |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1445 | |
| 1446 | if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY)) { |
| 1447 | trace2_region_enter("transport_push", "push_refs", r); |
| 1448 | push_ret = transport->vtable->push_refs(transport, remote_refs, flags); |
| 1449 | trace2_region_leave("transport_push", "push_refs", r); |
| 1450 | } else |
| 1451 | push_ret = 0; |
| 1452 | err = push_had_errors(remote_refs); |
| 1453 | ret = push_ret | err; |
| 1454 | |
| 1455 | if (!quiet || err) |
| 1456 | transport_print_push_status(transport->url, remote_refs, |
| 1457 | verbose | porcelain, porcelain, |
| 1458 | reject_reasons); |
| 1459 | |
| 1460 | if (flags & TRANSPORT_PUSH_SET_UPSTREAM) |
| 1461 | set_upstreams(transport, remote_refs, pretend); |
| 1462 | |
| 1463 | if (!(flags & (TRANSPORT_PUSH_DRY_RUN | |
| 1464 | TRANSPORT_RECURSE_SUBMODULES_ONLY))) { |
| 1465 | struct ref *ref; |
| 1466 | for (ref = remote_refs; ref; ref = ref->next) |
| 1467 | transport_update_tracking_ref(transport->remote, ref, verbose); |
| 1468 | } |
| 1469 | |
| 1470 | if (porcelain && !push_ret) |
| 1471 | puts("Done"); |
| 1472 | else if (!quiet && !ret && !transport_refs_pushed(remote_refs)) |
| 1473 | fprintf(stderr, "Everything up-to-date\n"); |
| 1474 | |
Frantisek Hrbata | 35919bf | 2022-05-20 14:49:51 +0200 | [diff] [blame] | 1475 | done: |
Frantisek Hrbata | 8c49d70 | 2022-05-20 14:49:52 +0200 | [diff] [blame] | 1476 | free_refs(local_refs); |
| 1477 | free_refs(remote_refs); |
Frantisek Hrbata | 6448182 | 2022-05-20 14:49:50 +0200 | [diff] [blame] | 1478 | return ret; |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1479 | } |
| 1480 | |
Brandon Williams | 1af8ae1 | 2018-03-15 10:31:23 -0700 | [diff] [blame] | 1481 | const struct ref *transport_get_remote_refs(struct transport *transport, |
Jonathan Tan | 3983540 | 2021-02-05 12:48:48 -0800 | [diff] [blame] | 1482 | struct transport_ls_refs_options *transport_options) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1483 | { |
| 1484 | if (!transport->got_remote_refs) { |
Brandon Williams | 1af8ae1 | 2018-03-15 10:31:23 -0700 | [diff] [blame] | 1485 | transport->remote_refs = |
| 1486 | transport->vtable->get_refs_list(transport, 0, |
Jonathan Tan | 3983540 | 2021-02-05 12:48:48 -0800 | [diff] [blame] | 1487 | transport_options); |
Tay Ray Chuan | b0d66e1 | 2010-02-16 15:18:21 +0800 | [diff] [blame] | 1488 | transport->got_remote_refs = 1; |
| 1489 | } |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 1490 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1491 | return transport->remote_refs; |
| 1492 | } |
| 1493 | |
Ævar Arnfjörð Bjarmason | f36d4f8 | 2022-02-05 01:08:14 +0100 | [diff] [blame] | 1494 | void transport_ls_refs_options_release(struct transport_ls_refs_options *opts) |
| 1495 | { |
| 1496 | strvec_clear(&opts->ref_prefixes); |
| 1497 | free((char *)opts->unborn_head_target); |
| 1498 | } |
| 1499 | |
Jonathan Tan | e2842b3 | 2018-08-01 13:13:20 -0700 | [diff] [blame] | 1500 | int transport_fetch_refs(struct transport *transport, struct ref *refs) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1501 | { |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1502 | int rc; |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1503 | int nr_heads = 0, nr_alloc = 0, nr_refs = 0; |
Daniel Barkalow | 3714831 | 2009-11-18 02:42:24 +0100 | [diff] [blame] | 1504 | struct ref **heads = NULL; |
| 1505 | struct ref *rm; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1506 | |
| 1507 | for (rm = refs; rm; rm = rm->next) { |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1508 | nr_refs++; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1509 | if (rm->peer_ref && |
brian m. carlson | f4e54d0 | 2015-11-10 02:22:20 +0000 | [diff] [blame] | 1510 | !is_null_oid(&rm->old_oid) && |
Jeff King | 4a7e27e | 2018-08-28 17:22:40 -0400 | [diff] [blame] | 1511 | oideq(&rm->peer_ref->old_oid, &rm->old_oid)) |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1512 | continue; |
Shawn O. Pearce | 7a2bff4 | 2007-09-14 03:31:18 -0400 | [diff] [blame] | 1513 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1514 | heads[nr_heads++] = rm; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1515 | } |
| 1516 | |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1517 | if (!nr_heads) { |
| 1518 | /* |
| 1519 | * When deepening of a shallow repository is requested, |
| 1520 | * then local and remote refs are likely to still be equal. |
| 1521 | * Just feed them all to the fetch method in that case. |
| 1522 | * This condition shouldn't be met in a non-deepening fetch |
Phil Hord | 09b7e22 | 2013-06-18 13:44:58 -0400 | [diff] [blame] | 1523 | * (see builtin/fetch.c:quickfetch()). |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1524 | */ |
Jeff King | b32fa95 | 2016-02-22 17:44:25 -0500 | [diff] [blame] | 1525 | ALLOC_ARRAY(heads, nr_refs); |
Nicolas Pitre | 8638682 | 2009-08-24 00:04:09 -0400 | [diff] [blame] | 1526 | for (rm = refs; rm; rm = rm->next) |
| 1527 | heads[nr_heads++] = rm; |
| 1528 | } |
| 1529 | |
Ævar Arnfjörð Bjarmason | 9b1cdd3 | 2021-08-05 03:25:35 +0200 | [diff] [blame] | 1530 | rc = transport->vtable->fetch_refs(transport, nr_heads, heads); |
Ilari Liusvaara | 61b075b | 2009-12-09 17:26:31 +0200 | [diff] [blame] | 1531 | |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1532 | free(heads); |
Shawn O. Pearce | 425b139 | 2007-09-14 03:31:21 -0400 | [diff] [blame] | 1533 | return rc; |
Daniel Barkalow | c29727d | 2007-09-10 23:03:11 -0400 | [diff] [blame] | 1534 | } |
| 1535 | |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 1536 | int transport_get_remote_bundle_uri(struct transport *transport) |
| 1537 | { |
Ævar Arnfjörð Bjarmason | 7cce907 | 2022-12-22 15:14:10 +0000 | [diff] [blame] | 1538 | int value = 0; |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 1539 | const struct transport_vtable *vtable = transport->vtable; |
| 1540 | |
| 1541 | /* Check config only once. */ |
| 1542 | if (transport->got_remote_bundle_uri) |
| 1543 | return 0; |
| 1544 | transport->got_remote_bundle_uri = 1; |
| 1545 | |
Ævar Arnfjörð Bjarmason | 7cce907 | 2022-12-22 15:14:10 +0000 | [diff] [blame] | 1546 | /* |
| 1547 | * Don't request bundle-uri from the server unless configured to |
| 1548 | * do so by the transfer.bundleURI=true config option. |
| 1549 | */ |
| 1550 | if (git_config_get_bool("transfer.bundleuri", &value) || !value) |
| 1551 | return 0; |
| 1552 | |
Derrick Stolee | ebc3947 | 2022-12-22 15:14:15 +0000 | [diff] [blame] | 1553 | if (!transport->bundles->baseURI) |
| 1554 | transport->bundles->baseURI = xstrdup(transport->url); |
| 1555 | |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 1556 | if (!vtable->get_bundle_uri) |
| 1557 | return error(_("bundle-uri operation not supported by protocol")); |
| 1558 | |
| 1559 | if (vtable->get_bundle_uri(transport) < 0) |
| 1560 | return error(_("could not retrieve server-advertised bundle-uri list")); |
| 1561 | return 0; |
| 1562 | } |
| 1563 | |
Patrick Steinhardt | 58d4d7f | 2022-01-07 11:55:47 +0100 | [diff] [blame] | 1564 | void transport_unlock_pack(struct transport *transport, unsigned int flags) |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1565 | { |
Patrick Steinhardt | 58d4d7f | 2022-01-07 11:55:47 +0100 | [diff] [blame] | 1566 | int in_signal_handler = !!(flags & TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER); |
Jonathan Tan | 9da69a6 | 2020-06-10 13:57:22 -0700 | [diff] [blame] | 1567 | int i; |
| 1568 | |
| 1569 | for (i = 0; i < transport->pack_lockfiles.nr; i++) |
Patrick Steinhardt | 58d4d7f | 2022-01-07 11:55:47 +0100 | [diff] [blame] | 1570 | if (in_signal_handler) |
| 1571 | unlink(transport->pack_lockfiles.items[i].string); |
| 1572 | else |
| 1573 | unlink_or_warn(transport->pack_lockfiles.items[i].string); |
| 1574 | if (!in_signal_handler) |
| 1575 | string_list_clear(&transport->pack_lockfiles, 0); |
Shawn O. Pearce | 1788c39 | 2007-09-14 03:31:23 -0400 | [diff] [blame] | 1576 | } |
| 1577 | |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 1578 | int transport_connect(struct transport *transport, const char *name, |
| 1579 | const char *exec, int fd[2]) |
| 1580 | { |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1581 | if (transport->vtable->connect) |
| 1582 | return transport->vtable->connect(transport, name, exec, fd); |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 1583 | else |
Nguyễn Thái Ngọc Duy | 68e39e4 | 2018-07-21 09:49:40 +0200 | [diff] [blame] | 1584 | die(_("operation not supported by protocol")); |
Ilari Liusvaara | b236752 | 2009-12-09 17:26:33 +0200 | [diff] [blame] | 1585 | } |
| 1586 | |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1587 | int transport_disconnect(struct transport *transport) |
| 1588 | { |
| 1589 | int ret = 0; |
Jonathan Tan | e967ca3 | 2017-12-14 13:44:45 -0800 | [diff] [blame] | 1590 | if (transport->vtable->disconnect) |
| 1591 | ret = transport->vtable->disconnect(transport); |
Andrzej Hunt | 68ffe09 | 2021-03-21 16:58:37 +0000 | [diff] [blame] | 1592 | if (transport->got_remote_refs) |
| 1593 | free_refs((void *)transport->remote_refs); |
Ævar Arnfjörð Bjarmason | 0cfde74 | 2022-12-22 15:14:09 +0000 | [diff] [blame] | 1594 | clear_bundle_list(transport->bundles); |
| 1595 | free(transport->bundles); |
Daniel Barkalow | 9b28851 | 2007-09-10 23:03:04 -0400 | [diff] [blame] | 1596 | free(transport); |
| 1597 | return ret; |
| 1598 | } |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1599 | |
| 1600 | /* |
Jim Meyering | a7793a7 | 2012-03-28 10:41:54 +0200 | [diff] [blame] | 1601 | * Strip username (and password) from a URL and return |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1602 | * it in a newly allocated string. |
| 1603 | */ |
| 1604 | char *transport_anonymize_url(const char *url) |
| 1605 | { |
Jeff King | 21f9d0f | 2016-02-22 17:45:05 -0500 | [diff] [blame] | 1606 | char *scheme_prefix, *anon_part; |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1607 | size_t anon_len, prefix_len = 0; |
| 1608 | |
| 1609 | anon_part = strchr(url, '@'); |
Torsten Bögershausen | c59ab2e | 2013-11-28 20:50:03 +0100 | [diff] [blame] | 1610 | if (url_is_local_not_ssh(url) || !anon_part) |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1611 | goto literal_copy; |
| 1612 | |
| 1613 | anon_len = strlen(++anon_part); |
| 1614 | scheme_prefix = strstr(url, "://"); |
| 1615 | if (!scheme_prefix) { |
| 1616 | if (!strchr(anon_part, ':')) |
| 1617 | /* cannot be "me@there:/path/name" */ |
| 1618 | goto literal_copy; |
| 1619 | } else { |
| 1620 | const char *cp; |
| 1621 | /* make sure scheme is reasonable */ |
| 1622 | for (cp = url; cp < scheme_prefix; cp++) { |
| 1623 | switch (*cp) { |
| 1624 | /* RFC 1738 2.1 */ |
| 1625 | case '+': case '.': case '-': |
| 1626 | break; /* ok */ |
| 1627 | default: |
| 1628 | if (isalnum(*cp)) |
| 1629 | break; |
| 1630 | /* it isn't */ |
| 1631 | goto literal_copy; |
| 1632 | } |
| 1633 | } |
| 1634 | /* @ past the first slash does not count */ |
| 1635 | cp = strchr(scheme_prefix + 3, '/'); |
| 1636 | if (cp && cp < anon_part) |
| 1637 | goto literal_copy; |
| 1638 | prefix_len = scheme_prefix - url + 3; |
| 1639 | } |
Jeff King | 21f9d0f | 2016-02-22 17:45:05 -0500 | [diff] [blame] | 1640 | return xstrfmt("%.*s%.*s", (int)prefix_len, url, |
| 1641 | (int)anon_len, anon_part); |
Andreas Ericsson | 47abd85 | 2009-04-17 10:20:11 +0200 | [diff] [blame] | 1642 | literal_copy: |
| 1643 | return xstrdup(url); |
| 1644 | } |