]>
Commit | Line | Data |
---|---|---|
d812c3b6 | 1 | #include "git-compat-util.h" |
6c6ddf92 | 2 | #include "advice.h" |
b2141fc1 | 3 | #include "config.h" |
32a8f510 | 4 | #include "environment.h" |
41771fa4 | 5 | #include "hex.h" |
9b288516 | 6 | #include "transport.h" |
5e3aba33 | 7 | #include "hook.h" |
c29727d5 DB |
8 | #include "pkt-line.h" |
9 | #include "fetch-pack.h" | |
47a59185 JH |
10 | #include "remote.h" |
11 | #include "connect.h" | |
40cb4fab | 12 | #include "send-pack.h" |
c29727d5 | 13 | #include "walker.h" |
c7a8a162 | 14 | #include "bundle.h" |
cd547b48 | 15 | #include "dir.h" |
36bf1958 | 16 | #include "gettext.h" |
cd547b48 | 17 | #include "refs.h" |
ec0cb496 | 18 | #include "refspec.h" |
e9fcd1e2 | 19 | #include "branch.h" |
638794cd | 20 | #include "url.h" |
d2b17b32 | 21 | #include "submodule.h" |
a762e51e | 22 | #include "string-list.h" |
fe299ec5 | 23 | #include "oid-array.h" |
af65f68c | 24 | #include "sigchain.h" |
74ea5c95 | 25 | #include "trace2.h" |
e967ca38 | 26 | #include "transport-internal.h" |
ad6ac124 | 27 | #include "protocol.h" |
dabab1d6 | 28 | #include "object-name.h" |
a034e910 | 29 | #include "object-store-ll.h" |
960786e7 | 30 | #include "color.h" |
0cfde740 | 31 | #include "bundle-uri.h" |
960786e7 RD |
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 | } | |
cd547b48 | 81 | |
e9fcd1e2 IL |
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; | |
e9fcd1e2 IL |
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; | |
f4e54d02 | 100 | if (is_null_oid(&ref->new_oid)) |
e9fcd1e2 IL |
101 | continue; |
102 | ||
103 | /* Follow symbolic refs (mainly for HEAD). */ | |
104 | localname = ref->peer_ref->name; | |
105 | remotename = ref->name; | |
7695d118 | 106 | tmp = resolve_ref_unsafe(localname, RESOLVE_REF_READING, |
744c040b | 107 | NULL, &flag); |
e9fcd1e2 | 108 | if (tmp && flag & REF_ISSYMREF && |
59556548 | 109 | starts_with(tmp, "refs/heads/")) |
e9fcd1e2 IL |
110 | localname = tmp; |
111 | ||
112 | /* Both source and destination must be local branches. */ | |
59556548 | 113 | if (!localname || !starts_with(localname, "refs/heads/")) |
e9fcd1e2 | 114 | continue; |
59556548 | 115 | if (!remotename || !starts_with(remotename, "refs/heads/")) |
e9fcd1e2 IL |
116 | continue; |
117 | ||
f3cce896 ØW |
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) | |
7ab1d44f | 123 | printf(_("Would set upstream of '%s' to '%s' of '%s'\n"), |
e9fcd1e2 IL |
124 | localname + 11, remotename + 11, |
125 | transport->remote->name); | |
126 | } | |
127 | } | |
128 | ||
c7a8a162 JS |
129 | struct bundle_transport_data { |
130 | int fd; | |
131 | struct bundle_header header; | |
fddf2ebe | 132 | unsigned get_refs_from_bundle_called : 1; |
c7a8a162 JS |
133 | }; |
134 | ||
0f0d118c | 135 | static void get_refs_from_bundle_inner(struct transport *transport) |
c7a8a162 JS |
136 | { |
137 | struct bundle_transport_data *data = transport->data; | |
64fcef2d | 138 | |
fddf2ebe JT |
139 | data->get_refs_from_bundle_called = 1; |
140 | ||
c7a8a162 JS |
141 | if (data->fd > 0) |
142 | close(data->fd); | |
143 | data->fd = read_bundle_header(transport->url, &data->header); | |
144 | if (data->fd < 0) | |
68e39e41 | 145 | die(_("could not read bundle '%s'"), transport->url); |
6161ce7b | 146 | |
147 | transport->hash_algo = data->header.hash_algo; | |
0f0d118c ÆAB |
148 | } |
149 | ||
150 | static struct ref *get_refs_from_bundle(struct transport *transport, | |
151 | int for_push, | |
5cf88fd8 | 152 | struct transport_ls_refs_options *transport_options UNUSED) |
0f0d118c ÆAB |
153 | { |
154 | struct bundle_transport_data *data = transport->data; | |
155 | struct ref *result = NULL; | |
156 | int i; | |
157 | ||
158 | if (for_push) | |
159 | return NULL; | |
160 | ||
161 | get_refs_from_bundle_inner(transport); | |
6161ce7b | 162 | |
c7a8a162 | 163 | for (i = 0; i < data->header.references.nr; i++) { |
10b635b7 ÆAB |
164 | struct string_list_item *e = data->header.references.items + i; |
165 | const char *name = e->string; | |
15e7c7dc | 166 | struct ref *ref = alloc_ref(name); |
10b635b7 | 167 | struct object_id *oid = e->util; |
15e7c7dc | 168 | oidcpy(&ref->old_oid, oid); |
c7a8a162 JS |
169 | ref->next = result; |
170 | result = ref; | |
171 | } | |
172 | return result; | |
173 | } | |
174 | ||
1788c39c | 175 | static int fetch_refs_from_bundle(struct transport *transport, |
b3edf335 JK |
176 | int nr_heads UNUSED, |
177 | struct ref **to_fetch UNUSED) | |
c7a8a162 JS |
178 | { |
179 | struct bundle_transport_data *data = transport->data; | |
7366096d | 180 | struct strvec extra_index_pack_args = STRVEC_INIT; |
6161ce7b | 181 | int ret; |
fddf2ebe | 182 | |
7366096d ÆAB |
183 | if (transport->progress) |
184 | strvec_push(&extra_index_pack_args, "-v"); | |
185 | ||
fddf2ebe | 186 | if (!data->get_refs_from_bundle_called) |
0f0d118c | 187 | get_refs_from_bundle_inner(transport); |
6161ce7b | 188 | ret = unbundle(the_repository, &data->header, data->fd, |
89bd7fed | 189 | &extra_index_pack_args, 0); |
6161ce7b | 190 | transport->hash_algo = data->header.hash_algo; |
191 | return ret; | |
c7a8a162 JS |
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); | |
10b635b7 | 199 | bundle_header_release(&data->header); |
f4e95765 | 200 | free(data); |
c7a8a162 JS |
201 | return 0; |
202 | } | |
203 | ||
9b288516 | 204 | struct git_transport_data { |
aa5af974 | 205 | struct git_transport_options options; |
ba227857 DB |
206 | struct child_process *conn; |
207 | int fd[2]; | |
1b759e0c | 208 | unsigned finished_handshake : 1; |
432e9565 | 209 | enum protocol_version version; |
910650d2 | 210 | struct oid_array extra_have; |
211 | struct oid_array shallow; | |
9b288516 DB |
212 | }; |
213 | ||
aa5af974 | 214 | static int set_git_option(struct git_transport_options *opts, |
9b288516 DB |
215 | const char *name, const char *value) |
216 | { | |
c29727d5 | 217 | if (!strcmp(name, TRANS_OPT_UPLOADPACK)) { |
aa5af974 | 218 | opts->uploadpack = value; |
c29727d5 DB |
219 | return 0; |
220 | } else if (!strcmp(name, TRANS_OPT_RECEIVEPACK)) { | |
aa5af974 | 221 | opts->receivepack = value; |
9b288516 DB |
222 | return 0; |
223 | } else if (!strcmp(name, TRANS_OPT_THIN)) { | |
aa5af974 | 224 | opts->thin = !!value; |
9b288516 | 225 | return 0; |
41fa7d2e | 226 | } else if (!strcmp(name, TRANS_OPT_FOLLOWTAGS)) { |
aa5af974 | 227 | opts->followtags = !!value; |
41fa7d2e | 228 | return 0; |
c29727d5 | 229 | } else if (!strcmp(name, TRANS_OPT_KEEP)) { |
aa5af974 | 230 | opts->keep = !!value; |
c29727d5 | 231 | return 0; |
48d25cae NTND |
232 | } else if (!strcmp(name, TRANS_OPT_UPDATE_SHALLOW)) { |
233 | opts->update_shallow = !!value; | |
234 | return 0; | |
c29727d5 DB |
235 | } else if (!strcmp(name, TRANS_OPT_DEPTH)) { |
236 | if (!value) | |
aa5af974 | 237 | opts->depth = 0; |
e7622ce8 NTND |
238 | else { |
239 | char *end; | |
240 | opts->depth = strtol(value, &end, 0); | |
241 | if (*end) | |
7ab1d44f | 242 | die(_("transport: invalid depth option '%s'"), value); |
e7622ce8 | 243 | } |
c29727d5 | 244 | return 0; |
508ea882 NTND |
245 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_SINCE)) { |
246 | opts->deepen_since = value; | |
247 | return 0; | |
a45a2600 NTND |
248 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_NOT)) { |
249 | opts->deepen_not = (const struct string_list *)value; | |
250 | return 0; | |
cccf74e2 NTND |
251 | } else if (!strcmp(name, TRANS_OPT_DEEPEN_RELATIVE)) { |
252 | opts->deepen_relative = !!value; | |
253 | return 0; | |
88e2f9ed JT |
254 | } else if (!strcmp(name, TRANS_OPT_FROM_PROMISOR)) { |
255 | opts->from_promisor = !!value; | |
256 | return 0; | |
640d8b72 | 257 | } else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) { |
489fc9ee | 258 | list_objects_filter_die_if_populated(&opts->filter_options); |
640d8b72 JH |
259 | parse_list_objects_filter(&opts->filter_options, value); |
260 | return 0; | |
3c7bab06 RC |
261 | } else if (!strcmp(name, TRANS_OPT_REFETCH)) { |
262 | opts->refetch = !!value; | |
263 | return 0; | |
4fe788b1 LL |
264 | } else if (!strcmp(name, TRANS_OPT_REJECT_SHALLOW)) { |
265 | opts->reject_shallow = !!value; | |
266 | return 0; | |
9b288516 DB |
267 | } |
268 | return 1; | |
269 | } | |
270 | ||
f3ee9ca5 | 271 | static int connect_setup(struct transport *transport, int for_push) |
ba227857 DB |
272 | { |
273 | struct git_transport_data *data = transport->data; | |
f3ee9ca5 | 274 | int flags = transport->verbose > 0 ? CONNECT_VERBOSE : 0; |
61b075bd IL |
275 | |
276 | if (data->conn) | |
277 | return 0; | |
278 | ||
c915f11e EW |
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 | ||
5a277f3f | 285 | data->conn = git_connect(data->fd, transport->url, |
eaa0fd65 JK |
286 | for_push ? |
287 | "git-receive-pack" : | |
288 | "git-upload-pack", | |
289 | for_push ? | |
290 | data->options.receivepack : | |
291 | data->options.uploadpack, | |
f3ee9ca5 | 292 | flags); |
61b075bd | 293 | |
ba227857 DB |
294 | return 0; |
295 | } | |
296 | ||
35eb8240 JT |
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 | ||
99bcb883 JT |
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, | |
39835409 | 315 | struct transport_ls_refs_options *options, |
99bcb883 | 316 | int must_list_refs) |
c29727d5 DB |
317 | { |
318 | struct git_transport_data *data = transport->data; | |
ad6ac124 BW |
319 | struct ref *refs = NULL; |
320 | struct packet_reader reader; | |
7ce4c8f7 | 321 | size_t sid_len; |
23bf486a | 322 | const char *server_sid; |
c29727d5 | 323 | |
f3ee9ca5 | 324 | connect_setup(transport, for_push); |
ad6ac124 BW |
325 | |
326 | packet_reader_init(&reader, data->fd[0], NULL, 0, | |
327 | PACKET_READ_CHOMP_NEWLINE | | |
2d103c31 MS |
328 | PACKET_READ_GENTLE_ON_EOF | |
329 | PACKET_READ_DIE_ON_ERR_PACKET); | |
ad6ac124 | 330 | |
432e9565 BW |
331 | data->version = discover_version(&reader); |
332 | switch (data->version) { | |
8f6982b4 | 333 | case protocol_v2: |
23bf486a JS |
334 | if (server_feature_v2("session-id", &server_sid)) |
335 | trace2_data_string("transfer", NULL, "server-sid", server_sid); | |
99bcb883 JT |
336 | if (must_list_refs) |
337 | get_remote_refs(data->fd[1], &reader, &refs, for_push, | |
39835409 | 338 | options, |
b0df0c16 DL |
339 | transport->server_options, |
340 | transport->stateless_rpc); | |
8f6982b4 | 341 | break; |
ad6ac124 BW |
342 | case protocol_v1: |
343 | case protocol_v0: | |
35eb8240 | 344 | die_if_server_options(transport); |
ad6ac124 BW |
345 | get_remote_heads(&reader, &refs, |
346 | for_push ? REF_NORMAL : 0, | |
347 | &data->extra_have, | |
348 | &data->shallow); | |
23bf486a JS |
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 | } | |
ad6ac124 BW |
355 | break; |
356 | case protocol_unknown_version: | |
357 | BUG("unknown protocol version"); | |
358 | } | |
1b759e0c | 359 | data->finished_handshake = 1; |
7c97af4d | 360 | transport->hash_algo = reader.hash_algo; |
c29727d5 | 361 | |
99bcb883 JT |
362 | if (reader.line_peeked) |
363 | BUG("buffer must be empty at the end of handshake()"); | |
364 | ||
c29727d5 DB |
365 | return refs; |
366 | } | |
367 | ||
99bcb883 | 368 | static struct ref *get_refs_via_connect(struct transport *transport, int for_push, |
39835409 | 369 | struct transport_ls_refs_options *options) |
99bcb883 | 370 | { |
39835409 | 371 | return handshake(transport, for_push, options, 1); |
99bcb883 JT |
372 | } |
373 | ||
0cfde740 ÆAB |
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 | ||
70b9c103 ÆAB |
385 | if (!data->finished_handshake) { |
386 | struct ref *refs = handshake(transport, 0, NULL, 0); | |
387 | ||
388 | if (refs) | |
389 | free_refs(refs); | |
390 | } | |
391 | ||
0cfde740 ÆAB |
392 | /* |
393 | * "Support" protocol v0 and v2 without bundle-uri support by | |
394 | * silently degrading to a NOOP. | |
395 | */ | |
0903d8bb | 396 | if (!server_supports_v2("bundle-uri")) |
0cfde740 ÆAB |
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 | ||
1788c39c | 407 | static int fetch_refs_via_pack(struct transport *transport, |
e2842b39 | 408 | int nr_heads, struct ref **to_fetch) |
c29727d5 | 409 | { |
e70a65c5 | 410 | int ret = 0; |
c29727d5 | 411 | struct git_transport_data *data = transport->data; |
432e9565 | 412 | struct ref *refs = NULL; |
c29727d5 | 413 | struct fetch_pack_args args; |
00183cbb | 414 | struct ref *refs_tmp = NULL; |
c29727d5 | 415 | |
fa740529 | 416 | memset(&args, 0, sizeof(args)); |
aa5af974 IL |
417 | args.uploadpack = data->options.uploadpack; |
418 | args.keep_pack = data->options.keep; | |
fa740529 | 419 | args.lock_pack = 1; |
aa5af974 IL |
420 | args.use_thin_pack = data->options.thin; |
421 | args.include_tag = data->options.followtags; | |
bd2c86ef | 422 | args.verbose = (transport->verbose > 1); |
fe8aa148 | 423 | args.quiet = (transport->verbose < 0); |
d01b3c02 | 424 | args.no_progress = !transport->progress; |
aa5af974 | 425 | args.depth = data->options.depth; |
508ea882 | 426 | args.deepen_since = data->options.deepen_since; |
a45a2600 | 427 | args.deepen_not = data->options.deepen_not; |
cccf74e2 | 428 | args.deepen_relative = data->options.deepen_relative; |
c6807a40 NTND |
429 | args.check_self_contained_and_connected = |
430 | data->options.check_self_contained_and_connected; | |
beea4152 | 431 | args.cloning = transport->cloning; |
48d25cae | 432 | args.update_shallow = data->options.update_shallow; |
88e2f9ed | 433 | args.from_promisor = data->options.from_promisor; |
3f0e86a1 JK |
434 | list_objects_filter_copy(&args.filter_options, |
435 | &data->options.filter_options); | |
3c7bab06 | 436 | args.refetch = data->options.refetch; |
edc9caf7 | 437 | args.stateless_rpc = transport->stateless_rpc; |
5e3548ef | 438 | args.server_options = transport->server_options; |
3390e42a | 439 | args.negotiation_tips = data->options.negotiation_tips; |
4fe788b1 | 440 | args.reject_shallow_remote = transport->smart_options->reject_shallow; |
c29727d5 | 441 | |
1b759e0c | 442 | if (!data->finished_handshake) { |
01775651 JT |
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 | } | |
ba227857 | 453 | |
dde72f94 | 454 | if (data->version == protocol_unknown_version) |
432e9565 | 455 | BUG("unknown protocol version"); |
dde72f94 DL |
456 | else if (data->version <= protocol_v1) |
457 | die_if_server_options(transport); | |
458 | ||
9c1e657a JT |
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 | ||
dde72f94 DL |
477 | refs = fetch_pack(&args, data->fd, |
478 | refs_tmp ? refs_tmp : transport->remote_refs, | |
479 | to_fetch, nr_heads, &data->shallow, | |
34e849b0 | 480 | &transport->pack_lockfiles, data->version); |
ba227857 | 481 | |
1b759e0c | 482 | data->finished_handshake = 0; |
c6807a40 NTND |
483 | data->options.self_contained_and_connected = |
484 | args.self_contained_and_connected; | |
cf1e7c07 | 485 | data->options.connectivity_checked = args.connectivity_checked; |
c29727d5 | 486 | |
afe8a907 | 487 | if (!refs) |
e70a65c5 MM |
488 | ret = -1; |
489 | if (report_unmatched_refs(to_fetch, nr_heads)) | |
490 | ret = -1; | |
491 | ||
9c1e657a JT |
492 | cleanup: |
493 | close(data->fd[0]); | |
ae1a7eef JK |
494 | if (data->fd[1] >= 0) |
495 | close(data->fd[1]); | |
9c1e657a JT |
496 | if (finish_connect(data->conn)) |
497 | ret = -1; | |
498 | data->conn = NULL; | |
499 | ||
00183cbb | 500 | free_refs(refs_tmp); |
e2842b39 | 501 | free_refs(refs); |
3f0e86a1 | 502 | list_objects_filter_release(&args.filter_options); |
e70a65c5 | 503 | return ret; |
c29727d5 DB |
504 | } |
505 | ||
481c7a6d JK |
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 | ||
f1863d0d | 521 | int transport_refs_pushed(struct ref *ref) |
64fcef2d DB |
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 | ||
1702ae6f JX |
535 | static void update_one_tracking_ref(struct remote *remote, char *refname, |
536 | struct object_id *new_oid, int deletion, | |
537 | int verbose) | |
64fcef2d | 538 | { |
0ad4a5ff | 539 | struct refspec_item rs; |
64fcef2d | 540 | |
95e7c385 | 541 | memset(&rs, 0, sizeof(rs)); |
1702ae6f | 542 | rs.src = refname; |
64fcef2d DB |
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); | |
1702ae6f | 548 | if (deletion) |
755b49ae | 549 | delete_ref(NULL, rs.dst, NULL, 0); |
1702ae6f JX |
550 | else |
551 | update_ref("update by push", rs.dst, new_oid, | |
ae077771 | 552 | NULL, 0, 0); |
64fcef2d DB |
553 | free(rs.dst); |
554 | } | |
555 | } | |
556 | ||
1702ae6f JX |
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 | ||
7101e10c JH |
579 | static void print_ref_status(char flag, const char *summary, |
580 | struct ref *to, struct ref *from, const char *msg, | |
63518a57 | 581 | struct ref_push_report *report, |
7101e10c | 582 | int porcelain, int summary_width) |
64fcef2d | 583 | { |
63518a57 JX |
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 | ||
1965ff74 LA |
591 | if (porcelain) { |
592 | if (from) | |
63518a57 | 593 | fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to_name); |
1965ff74 | 594 | else |
63518a57 | 595 | fprintf(stdout, "%c\t:%s\t", flag, to_name); |
1965ff74 LA |
596 | if (msg) |
597 | fprintf(stdout, "%s (%s)\n", summary, msg); | |
598 | else | |
599 | fprintf(stdout, "%s\n", summary); | |
600 | } else { | |
960786e7 RD |
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); | |
1965ff74 | 608 | if (from) |
63518a57 JX |
609 | fprintf(stderr, "%s -> %s", |
610 | prettify_refname(from->name), | |
611 | prettify_refname(to_name)); | |
1965ff74 | 612 | else |
63518a57 | 613 | fputs(prettify_refname(to_name), stderr); |
1965ff74 LA |
614 | if (msg) { |
615 | fputs(" (", stderr); | |
616 | fputs(msg, stderr); | |
617 | fputc(')', stderr); | |
618 | } | |
619 | fputc('\n', stderr); | |
64fcef2d | 620 | } |
64fcef2d DB |
621 | } |
622 | ||
63518a57 JX |
623 | static void print_ok_ref_status(struct ref *ref, |
624 | struct ref_push_report *report, | |
625 | int porcelain, int summary_width) | |
64fcef2d | 626 | { |
63518a57 JX |
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 | ||
64fcef2d | 649 | if (ref->deletion) |
7101e10c | 650 | print_ref_status('-', "[deleted]", ref, NULL, NULL, |
63518a57 JX |
651 | report, porcelain, summary_width); |
652 | else if (is_null_oid(old_oid)) | |
64fcef2d | 653 | print_ref_status('*', |
63518a57 | 654 | (starts_with(ref_name, "refs/tags/") |
917c6125 | 655 | ? "[new tag]" |
63518a57 | 656 | : (starts_with(ref_name, "refs/heads/") |
917c6125 JX |
657 | ? "[new branch]" |
658 | : "[new reference]")), | |
63518a57 JX |
659 | ref, ref->peer_ref, NULL, |
660 | report, porcelain, summary_width); | |
64fcef2d | 661 | else { |
bd22d4ff | 662 | struct strbuf quickref = STRBUF_INIT; |
64fcef2d DB |
663 | char type; |
664 | const char *msg; | |
665 | ||
63518a57 | 666 | strbuf_add_unique_abbrev(&quickref, old_oid, |
1eb47f16 | 667 | DEFAULT_ABBREV); |
63518a57 | 668 | if (forced_update) { |
bd22d4ff | 669 | strbuf_addstr(&quickref, "..."); |
64fcef2d DB |
670 | type = '+'; |
671 | msg = "forced update"; | |
672 | } else { | |
bd22d4ff | 673 | strbuf_addstr(&quickref, ".."); |
64fcef2d DB |
674 | type = ' '; |
675 | msg = NULL; | |
676 | } | |
63518a57 | 677 | strbuf_add_unique_abbrev(&quickref, new_oid, |
1eb47f16 | 678 | DEFAULT_ABBREV); |
64fcef2d | 679 | |
7101e10c | 680 | print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg, |
63518a57 | 681 | report, porcelain, summary_width); |
bd22d4ff | 682 | strbuf_release(&quickref); |
64fcef2d DB |
683 | } |
684 | } | |
685 | ||
63518a57 JX |
686 | static int print_one_push_report(struct ref *ref, const char *dest, int count, |
687 | struct ref_push_report *report, | |
7101e10c | 688 | int porcelain, int summary_width) |
64fcef2d | 689 | { |
882d49ca JK |
690 | if (!count) { |
691 | char *url = transport_anonymize_url(dest); | |
692 | fprintf(porcelain ? stdout : stderr, "To %s\n", url); | |
693 | free(url); | |
694 | } | |
64fcef2d DB |
695 | |
696 | switch(ref->status) { | |
697 | case REF_STATUS_NONE: | |
7101e10c | 698 | print_ref_status('X', "[no match]", ref, NULL, NULL, |
63518a57 | 699 | report, porcelain, summary_width); |
64fcef2d DB |
700 | break; |
701 | case REF_STATUS_REJECT_NODELETE: | |
702 | print_ref_status('!', "[rejected]", ref, NULL, | |
7101e10c | 703 | "remote does not support deleting refs", |
63518a57 | 704 | report, porcelain, summary_width); |
64fcef2d DB |
705 | break; |
706 | case REF_STATUS_UPTODATE: | |
707 | print_ref_status('=', "[up to date]", ref, | |
63518a57 JX |
708 | ref->peer_ref, NULL, |
709 | report, porcelain, summary_width); | |
64fcef2d DB |
710 | break; |
711 | case REF_STATUS_REJECT_NONFASTFORWARD: | |
712 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
63518a57 JX |
713 | "non-fast-forward", |
714 | report, porcelain, summary_width); | |
64fcef2d | 715 | break; |
dbfeddb1 CR |
716 | case REF_STATUS_REJECT_ALREADY_EXISTS: |
717 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
63518a57 JX |
718 | "already exists", |
719 | report, porcelain, summary_width); | |
dbfeddb1 | 720 | break; |
75e5c0dc JH |
721 | case REF_STATUS_REJECT_FETCH_FIRST: |
722 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
63518a57 JX |
723 | "fetch first", |
724 | report, porcelain, summary_width); | |
75e5c0dc JH |
725 | break; |
726 | case REF_STATUS_REJECT_NEEDS_FORCE: | |
727 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
63518a57 JX |
728 | "needs force", |
729 | report, porcelain, summary_width); | |
75e5c0dc | 730 | break; |
631b5ef2 JH |
731 | case REF_STATUS_REJECT_STALE: |
732 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
63518a57 JX |
733 | "stale info", |
734 | report, porcelain, summary_width); | |
631b5ef2 | 735 | break; |
99a1f9ae SK |
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; | |
4820a33b NTND |
741 | case REF_STATUS_REJECT_SHALLOW: |
742 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
7101e10c | 743 | "new shallow roots not allowed", |
63518a57 | 744 | report, porcelain, summary_width); |
4820a33b | 745 | break; |
64fcef2d DB |
746 | case REF_STATUS_REMOTE_REJECT: |
747 | print_ref_status('!', "[remote rejected]", ref, | |
7101e10c | 748 | ref->deletion ? NULL : ref->peer_ref, |
63518a57 JX |
749 | ref->remote_status, |
750 | report, porcelain, summary_width); | |
64fcef2d DB |
751 | break; |
752 | case REF_STATUS_EXPECTING_REPORT: | |
753 | print_ref_status('!', "[remote failure]", ref, | |
7101e10c JH |
754 | ref->deletion ? NULL : ref->peer_ref, |
755 | "remote failed to report status", | |
63518a57 | 756 | report, porcelain, summary_width); |
64fcef2d | 757 | break; |
4ff17f10 RS |
758 | case REF_STATUS_ATOMIC_PUSH_FAILED: |
759 | print_ref_status('!', "[rejected]", ref, ref->peer_ref, | |
63518a57 JX |
760 | "atomic push failed", |
761 | report, porcelain, summary_width); | |
4ff17f10 | 762 | break; |
64fcef2d | 763 | case REF_STATUS_OK: |
63518a57 | 764 | print_ok_ref_status(ref, report, porcelain, summary_width); |
64fcef2d DB |
765 | break; |
766 | } | |
767 | ||
768 | return 1; | |
769 | } | |
770 | ||
63518a57 JX |
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 | ||
db98d9ba JH |
787 | static int measure_abbrev(const struct object_id *oid, int sofar) |
788 | { | |
dc01505f | 789 | char hex[GIT_MAX_HEXSZ + 1]; |
d850b7a5 ÆAB |
790 | int w = repo_find_unique_abbrev_r(the_repository, hex, oid, |
791 | DEFAULT_ABBREV); | |
db98d9ba JH |
792 | |
793 | return (w < sofar) ? sofar : w; | |
794 | } | |
795 | ||
11fd66de JH |
796 | int transport_summary_width(const struct ref *refs) |
797 | { | |
db98d9ba JH |
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); | |
11fd66de JH |
807 | } |
808 | ||
f1863d0d | 809 | void transport_print_push_status(const char *dest, struct ref *refs, |
10643d4e | 810 | int verbose, int porcelain, unsigned int *reject_reasons) |
64fcef2d DB |
811 | { |
812 | struct ref *ref; | |
813 | int n = 0; | |
f25950f3 | 814 | char *head; |
11fd66de | 815 | int summary_width = transport_summary_width(refs); |
f25950f3 | 816 | |
960786e7 RD |
817 | if (transport_color_config() < 0) |
818 | warning(_("could not parse transport.color.* config")); | |
819 | ||
efbd4fdf | 820 | head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL); |
64fcef2d DB |
821 | |
822 | if (verbose) { | |
823 | for (ref = refs; ref; ref = ref->next) | |
824 | if (ref->status == REF_STATUS_UPTODATE) | |
7101e10c JH |
825 | n += print_one_push_status(ref, dest, n, |
826 | porcelain, summary_width); | |
64fcef2d DB |
827 | } |
828 | ||
829 | for (ref = refs; ref; ref = ref->next) | |
830 | if (ref->status == REF_STATUS_OK) | |
7101e10c JH |
831 | n += print_one_push_status(ref, dest, n, |
832 | porcelain, summary_width); | |
64fcef2d | 833 | |
10643d4e | 834 | *reject_reasons = 0; |
64fcef2d DB |
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) | |
7101e10c JH |
839 | n += print_one_push_status(ref, dest, n, |
840 | porcelain, summary_width); | |
10643d4e | 841 | if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) { |
1d2c14df | 842 | if (head != NULL && !strcmp(head, ref->name)) |
10643d4e | 843 | *reject_reasons |= REJECT_NON_FF_HEAD; |
f25950f3 | 844 | else |
10643d4e | 845 | *reject_reasons |= REJECT_NON_FF_OTHER; |
dbfeddb1 CR |
846 | } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) { |
847 | *reject_reasons |= REJECT_ALREADY_EXISTS; | |
75e5c0dc JH |
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; | |
3b990aa6 SK |
852 | } else if (ref->status == REF_STATUS_REJECT_REMOTE_UPDATED) { |
853 | *reject_reasons |= REJECT_REF_NEEDS_UPDATE; | |
f25950f3 | 854 | } |
64fcef2d | 855 | } |
dc76c7f7 | 856 | free(head); |
64fcef2d DB |
857 | } |
858 | ||
64fcef2d | 859 | static int git_transport_push(struct transport *transport, struct ref *remote_refs, int flags) |
f3fa1838 | 860 | { |
9b288516 | 861 | struct git_transport_data *data = transport->data; |
40cb4fab | 862 | struct send_pack_args args; |
432e9565 | 863 | int ret = 0; |
64fcef2d | 864 | |
960786e7 RD |
865 | if (transport_color_config() < 0) |
866 | return -1; | |
867 | ||
1b759e0c | 868 | if (!data->finished_handshake) |
834cf34b | 869 | get_refs_via_connect(transport, 1, NULL); |
9b288516 | 870 | |
de1a2fdd | 871 | memset(&args, 0, sizeof(args)); |
94c89ba6 | 872 | args.send_mirror = !!(flags & TRANSPORT_PUSH_MIRROR); |
40cb4fab | 873 | args.force_update = !!(flags & TRANSPORT_PUSH_FORCE); |
aa5af974 | 874 | args.use_thin_pack = data->options.thin; |
8afd8dc0 TRC |
875 | args.verbose = (transport->verbose > 0); |
876 | args.quiet = (transport->verbose < 0); | |
d7c411b7 | 877 | args.progress = transport->progress; |
40cb4fab | 878 | args.dry_run = !!(flags & TRANSPORT_PUSH_DRY_RUN); |
77555854 | 879 | args.porcelain = !!(flags & TRANSPORT_PUSH_PORCELAIN); |
d0e8e09c | 880 | args.atomic = !!(flags & TRANSPORT_PUSH_ATOMIC); |
f6a4e61f | 881 | args.push_options = transport->push_options; |
9be89160 | 882 | args.url = transport->url; |
40cb4fab | 883 | |
30261094 DB |
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 | ||
432e9565 | 891 | switch (data->version) { |
8f6982b4 | 892 | case protocol_v2: |
68e39e41 | 893 | die(_("support for protocol v2 not implemented yet")); |
8f6982b4 | 894 | break; |
432e9565 BW |
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 | } | |
64fcef2d DB |
903 | |
904 | close(data->fd[1]); | |
905 | close(data->fd[0]); | |
7dcbeaa0 JX |
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); | |
64fcef2d | 915 | data->conn = NULL; |
1b759e0c | 916 | data->finished_handshake = 0; |
64fcef2d DB |
917 | |
918 | return ret; | |
9b288516 DB |
919 | } |
920 | ||
b236752a IL |
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, | |
eaa0fd65 | 926 | name, executable, 0); |
b236752a IL |
927 | fd[0] = data->fd[0]; |
928 | fd[1] = data->fd[1]; | |
929 | return 0; | |
930 | } | |
931 | ||
f4e95765 SP |
932 | static int disconnect_git(struct transport *transport) |
933 | { | |
ba227857 DB |
934 | struct git_transport_data *data = transport->data; |
935 | if (data->conn) { | |
1b759e0c | 936 | if (data->finished_handshake && !transport->stateless_rpc) |
61b075bd | 937 | packet_flush(data->fd[1]); |
ba227857 | 938 | close(data->fd[0]); |
ae1a7eef JK |
939 | if (data->fd[1] >= 0) |
940 | close(data->fd[1]); | |
ba227857 DB |
941 | finish_connect(data->conn); |
942 | } | |
943 | ||
dd49699d | 944 | list_objects_filter_release(&data->options.filter_options); |
ba227857 | 945 | free(data); |
f4e95765 SP |
946 | return 0; |
947 | } | |
948 | ||
e967ca38 | 949 | static struct transport_vtable taken_over_vtable = { |
1fd88224 | 950 | .get_refs_list = get_refs_via_connect, |
0cfde740 | 951 | .get_bundle_uri = get_bundle_uri, |
1fd88224 ÆAB |
952 | .fetch_refs = fetch_refs_via_pack, |
953 | .push_refs = git_transport_push, | |
954 | .disconnect = disconnect_git | |
e967ca38 JT |
955 | }; |
956 | ||
61b075bd IL |
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) | |
033abf97 | 963 | BUG("taking over transport requires non-NULL " |
61b075bd IL |
964 | "smart_options field."); |
965 | ||
ca56dadb | 966 | CALLOC_ARRAY(data, 1); |
61b075bd IL |
967 | data->options = *transport->smart_options; |
968 | data->conn = child; | |
969 | data->fd[0] = data->conn->out; | |
970 | data->fd[1] = data->conn->in; | |
1b759e0c | 971 | data->finished_handshake = 0; |
61b075bd IL |
972 | transport->data = data; |
973 | ||
e967ca38 | 974 | transport->vtable = &taken_over_vtable; |
61b075bd | 975 | transport->smart_options = &(data->options); |
b26ed430 JH |
976 | |
977 | transport->cannot_reuse = 1; | |
61b075bd IL |
978 | } |
979 | ||
9b288516 DB |
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 | ||
25d5cc48 IL |
988 | static int external_specification_len(const char *url) |
989 | { | |
990 | return strchr(url, ':') - url; | |
991 | } | |
992 | ||
f5adaa5c | 993 | static const struct string_list *protocol_allow_list(void) |
a5adaced | 994 | { |
5088d3b3 JK |
995 | static int enabled = -1; |
996 | static struct string_list allowed = STRING_LIST_INIT_DUP; | |
a5adaced | 997 | |
5088d3b3 JK |
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 | } | |
a5adaced | 1011 | |
f1762d77 BW |
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) | |
5088d3b3 | 1020 | { |
f1762d77 BW |
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 | ||
68e39e41 | 1028 | die(_("unknown value for config '%s': %s"), key, value); |
5088d3b3 JK |
1029 | } |
1030 | ||
f1762d77 | 1031 | static enum protocol_allow_config get_protocol_config(const char *type) |
5088d3b3 | 1032 | { |
f1762d77 BW |
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") || | |
a1d4f67c | 1059 | !strcmp(type, "ssh")) |
f1762d77 BW |
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; | |
5088d3b3 JK |
1068 | } |
1069 | ||
a768a022 | 1070 | int is_transport_allowed(const char *type, int from_user) |
5088d3b3 | 1071 | { |
f5adaa5c DS |
1072 | const struct string_list *allow_list = protocol_allow_list(); |
1073 | if (allow_list) | |
1074 | return string_list_has_string(allow_list, type); | |
f1762d77 BW |
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: | |
a768a022 BW |
1082 | if (from_user < 0) |
1083 | from_user = git_env_bool("GIT_PROTOCOL_FROM_USER", 1); | |
1084 | return from_user; | |
f1762d77 BW |
1085 | } |
1086 | ||
033abf97 | 1087 | BUG("invalid protocol_allow_config type"); |
5088d3b3 JK |
1088 | } |
1089 | ||
1090 | void transport_check_allowed(const char *type) | |
1091 | { | |
a768a022 | 1092 | if (!is_transport_allowed(type, -1)) |
68e39e41 | 1093 | die(_("transport '%s' not allowed"), type); |
a5adaced JK |
1094 | } |
1095 | ||
e967ca38 | 1096 | static struct transport_vtable bundle_vtable = { |
1fd88224 ÆAB |
1097 | .get_refs_list = get_refs_from_bundle, |
1098 | .fetch_refs = fetch_refs_from_bundle, | |
1099 | .disconnect = close_bundle | |
e967ca38 JT |
1100 | }; |
1101 | ||
1102 | static struct transport_vtable builtin_smart_vtable = { | |
1fd88224 | 1103 | .get_refs_list = get_refs_via_connect, |
0cfde740 | 1104 | .get_bundle_uri = get_bundle_uri, |
1fd88224 ÆAB |
1105 | .fetch_refs = fetch_refs_via_pack, |
1106 | .push_refs = git_transport_push, | |
1107 | .connect = connect_git, | |
1108 | .disconnect = disconnect_git | |
e967ca38 JT |
1109 | }; |
1110 | ||
e5f4e214 | 1111 | struct transport *transport_get(struct remote *remote, const char *url) |
9b288516 | 1112 | { |
4da50460 | 1113 | const char *helper; |
8eb554ae SP |
1114 | struct transport *ret = xcalloc(1, sizeof(*ret)); |
1115 | ||
d01b3c02 | 1116 | ret->progress = isatty(2); |
bc40dfb1 | 1117 | string_list_init_dup(&ret->pack_lockfiles); |
d01b3c02 | 1118 | |
0cfde740 ÆAB |
1119 | CALLOC_ARRAY(ret->bundles, 1); |
1120 | init_bundle_list(ret->bundles); | |
1121 | ||
c1d45cf7 | 1122 | if (!remote) |
1a07e59c | 1123 | BUG("No remote provided to transport_get()"); |
c1d45cf7 | 1124 | |
b0d66e15 | 1125 | ret->got_remote_refs = 0; |
8eb554ae | 1126 | ret->remote = remote; |
4da50460 | 1127 | helper = remote->foreign_vcs; |
fb0cc87e | 1128 | |
cb21d8f0 | 1129 | if (!url && remote->url) |
fb0cc87e | 1130 | url = remote->url[0]; |
8eb554ae | 1131 | ret->url = url; |
8eb554ae | 1132 | |
87422439 JS |
1133 | /* maybe it is a foreign URL? */ |
1134 | if (url) { | |
1135 | const char *p = url; | |
1136 | ||
638794cd | 1137 | while (is_urlschemechar(p == url, *p)) |
87422439 | 1138 | p++; |
59556548 | 1139 | if (starts_with(p, "::")) |
4da50460 | 1140 | helper = xstrndup(url, p - url); |
87422439 JS |
1141 | } |
1142 | ||
4da50460 IL |
1143 | if (helper) { |
1144 | transport_helper_init(ret, helper); | |
59556548 | 1145 | } else if (starts_with(url, "rsync:")) { |
68e39e41 | 1146 | die(_("git-over-rsync is no longer supported")); |
c59ab2e5 | 1147 | } else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) { |
c7a8a162 | 1148 | struct bundle_transport_data *data = xcalloc(1, sizeof(*data)); |
10b635b7 | 1149 | bundle_header_init(&data->header); |
a5adaced | 1150 | transport_check_allowed("file"); |
c7a8a162 | 1151 | ret->data = data; |
e967ca38 | 1152 | ret->vtable = &bundle_vtable; |
aa5af974 | 1153 | ret->smart_options = NULL; |
25d5cc48 | 1154 | } else if (!is_url(url) |
59556548 CC |
1155 | || starts_with(url, "file://") |
1156 | || starts_with(url, "git://") | |
1157 | || starts_with(url, "ssh://") | |
07c7782c CMN |
1158 | || starts_with(url, "git+ssh://") /* deprecated - do not use */ |
1159 | || starts_with(url, "ssh+git://") /* deprecated - do not use */ | |
1160 | ) { | |
a5adaced JK |
1161 | /* |
1162 | * These are builtin smart transports; "allowed" transports | |
1163 | * will be checked individually in git_connect. | |
1164 | */ | |
9b288516 | 1165 | struct git_transport_data *data = xcalloc(1, sizeof(*data)); |
2a01bded | 1166 | list_objects_filter_init(&data->options.filter_options); |
9b288516 | 1167 | ret->data = data; |
e967ca38 | 1168 | ret->vtable = &builtin_smart_vtable; |
aa5af974 | 1169 | ret->smart_options = &(data->options); |
824d5776 | 1170 | |
ba227857 | 1171 | data->conn = NULL; |
1b759e0c | 1172 | data->finished_handshake = 0; |
25d5cc48 IL |
1173 | } else { |
1174 | /* Unknown protocol in URL. Pass to external handler. */ | |
1175 | int len = external_specification_len(url); | |
6b33894f | 1176 | char *handler = xmemdupz(url, len); |
25d5cc48 | 1177 | transport_helper_init(ret, handler); |
9b288516 | 1178 | } |
8eb554ae | 1179 | |
aa5af974 IL |
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 | ||
7c97af4d | 1190 | ret->hash_algo = &hash_algos[GIT_HASH_SHA1]; |
1191 | ||
9b288516 DB |
1192 | return ret; |
1193 | } | |
1194 | ||
7c97af4d | 1195 | const struct git_hash_algo *transport_get_hash_algo(struct transport *transport) |
1196 | { | |
1197 | return transport->hash_algo; | |
1198 | } | |
1199 | ||
9b288516 DB |
1200 | int transport_set_option(struct transport *transport, |
1201 | const char *name, const char *value) | |
1202 | { | |
aa5af974 IL |
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 | ||
e967ca38 JT |
1209 | if (transport->vtable->set_option) |
1210 | protocol_reports = transport->vtable->set_option(transport, | |
1211 | name, value); | |
aa5af974 IL |
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. */ | |
ab865e6e | 1220 | return 1; |
9b288516 DB |
1221 | } |
1222 | ||
d01b3c02 TRC |
1223 | void transport_set_verbosity(struct transport *transport, int verbosity, |
1224 | int force_progress) | |
bde873c5 | 1225 | { |
bd2c86ef | 1226 | if (verbosity >= 1) |
bde873c5 TRC |
1227 | transport->verbose = verbosity <= 3 ? verbosity : 3; |
1228 | if (verbosity < 0) | |
1229 | transport->verbose = -1; | |
d01b3c02 TRC |
1230 | |
1231 | /** | |
1232 | * Rules used to determine whether to report progress (processing aborts | |
1233 | * when a rule is satisfied): | |
1234 | * | |
01fdc21f CB |
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. | |
d01b3c02 | 1239 | **/ |
01fdc21f CB |
1240 | if (force_progress >= 0) |
1241 | transport->progress = !!force_progress; | |
1242 | else | |
1243 | transport->progress = verbosity >= 0 && isatty(2); | |
bde873c5 TRC |
1244 | } |
1245 | ||
a762e51e HV |
1246 | static void die_with_unpushed_submodules(struct string_list *needs_pushing) |
1247 | { | |
1248 | int i; | |
1249 | ||
7ab1d44f VA |
1250 | fprintf(stderr, _("The following submodule paths contain changes that can\n" |
1251 | "not be found on any remote:\n")); | |
a762e51e | 1252 | for (i = 0; i < needs_pushing->nr; i++) |
5cb5fe4a | 1253 | fprintf(stderr, " %s\n", needs_pushing->items[i].string); |
7ab1d44f VA |
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")); | |
a762e51e HV |
1259 | |
1260 | string_list_clear(needs_pushing, 0); | |
1261 | ||
7ab1d44f | 1262 | die(_("Aborting.")); |
a762e51e HV |
1263 | } |
1264 | ||
ec55559f AS |
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; | |
d3180279 | 1270 | struct child_process proc = CHILD_PROCESS_INIT; |
ec55559f | 1271 | struct strbuf buf; |
7f14609e | 1272 | const char *hook_path = find_hook("pre-push"); |
ec55559f | 1273 | |
7f14609e | 1274 | if (!hook_path) |
ec55559f AS |
1275 | return 0; |
1276 | ||
7f14609e ÆAB |
1277 | strvec_push(&proc.args, hook_path); |
1278 | strvec_push(&proc.args, transport->remote->name); | |
1279 | strvec_push(&proc.args, transport->url); | |
ec55559f | 1280 | |
ec55559f | 1281 | proc.in = -1; |
6206286e | 1282 | proc.trace2_hook_name = "pre-push"; |
ec55559f AS |
1283 | |
1284 | if (start_command(&proc)) { | |
1285 | finish_command(&proc); | |
1286 | return -1; | |
1287 | } | |
1288 | ||
af65f68c CB |
1289 | sigchain_push(SIGPIPE, SIG_IGN); |
1290 | ||
ec55559f AS |
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; | |
631b5ef2 | 1296 | if (r->status == REF_STATUS_REJECT_STALE) continue; |
99a1f9ae | 1297 | if (r->status == REF_STATUS_REJECT_REMOTE_UPDATED) continue; |
ec55559f AS |
1298 | if (r->status == REF_STATUS_UPTODATE) continue; |
1299 | ||
1300 | strbuf_reset(&buf); | |
1301 | strbuf_addf( &buf, "%s %s %s %s\n", | |
f4e54d02 | 1302 | r->peer_ref->name, oid_to_hex(&r->new_oid), |
1303 | r->name, oid_to_hex(&r->old_oid)); | |
ec55559f | 1304 | |
af65f68c CB |
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; | |
ec55559f AS |
1309 | break; |
1310 | } | |
1311 | } | |
1312 | ||
1313 | strbuf_release(&buf); | |
1314 | ||
1315 | x = close(proc.in); | |
1316 | if (!ret) | |
1317 | ret = x; | |
1318 | ||
af65f68c CB |
1319 | sigchain_pop(SIGPIPE); |
1320 | ||
ec55559f AS |
1321 | x = finish_command(&proc); |
1322 | if (!ret) | |
1323 | ret = x; | |
1324 | ||
1325 | return ret; | |
1326 | } | |
1327 | ||
6c6d5d07 NTND |
1328 | int transport_push(struct repository *r, |
1329 | struct transport *transport, | |
306f22db | 1330 | struct refspec *rs, int flags, |
10643d4e | 1331 | unsigned int *reject_reasons) |
9b288516 | 1332 | { |
35919bf1 FH |
1333 | struct ref *remote_refs = NULL; |
1334 | struct ref *local_refs = NULL; | |
6448182a FH |
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; | |
35919bf1 FH |
1340 | int push_ret, err; |
1341 | int ret = -1; | |
6448182a FH |
1342 | struct transport_ls_refs_options transport_options = |
1343 | TRANSPORT_LS_REFS_OPTIONS_INIT; | |
1344 | ||
10643d4e | 1345 | *reject_reasons = 0; |
64fcef2d | 1346 | |
960786e7 | 1347 | if (transport_color_config() < 0) |
35919bf1 | 1348 | goto done; |
960786e7 | 1349 | |
6448182a | 1350 | if (!transport->vtable->push_refs) |
35919bf1 | 1351 | goto done; |
ba928c13 | 1352 | |
6448182a | 1353 | local_refs = get_local_heads(); |
5b872fff | 1354 | |
6448182a | 1355 | if (check_push_refs(local_refs, rs) < 0) |
35919bf1 | 1356 | goto done; |
5b872fff | 1357 | |
6448182a | 1358 | refspec_ref_prefixes(rs, &transport_options.ref_prefixes); |
ba928c13 | 1359 | |
6448182a FH |
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); | |
64fcef2d | 1364 | |
6448182a | 1365 | transport_ls_refs_options_release(&transport_options); |
64fcef2d | 1366 | |
6448182a FH |
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; | |
91048a95 | 1375 | |
6448182a | 1376 | if (match_push_refs(local_refs, &remote_refs, rs, match_flags)) |
35919bf1 | 1377 | goto done; |
20e8b465 | 1378 | |
6448182a FH |
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); | |
ec55559f | 1384 | |
6448182a FH |
1385 | set_ref_status_for_push(remote_refs, |
1386 | flags & TRANSPORT_PUSH_MIRROR, | |
1387 | flags & TRANSPORT_PUSH_FORCE); | |
1388 | ||
1389 | if (!(flags & TRANSPORT_PUSH_NO_HOOK)) | |
1390 | if (run_pre_push_hook(transport, remote_refs)) | |
35919bf1 | 1391 | goto done; |
6448182a FH |
1392 | |
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; | |
1398 | ||
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); | |
1404 | ||
1405 | if (!push_unpushed_submodules(r, | |
1406 | &commits, | |
1407 | transport->remote, | |
1408 | rs, | |
1409 | transport->push_options, | |
1410 | pretend)) { | |
910650d2 | 1411 | oid_array_clear(&commits); |
360c7ba3 | 1412 | trace2_region_leave("transport_push", "push_submodules", r); |
6448182a | 1413 | die(_("failed to push all needed submodules")); |
eb21c732 | 1414 | } |
6448182a FH |
1415 | oid_array_clear(&commits); |
1416 | trace2_region_leave("transport_push", "push_submodules", r); | |
1417 | } | |
eb21c732 | 1418 | |
6448182a FH |
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; | |
1426 | ||
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); | |
1432 | ||
1433 | if (find_unpushed_submodules(r, | |
1434 | &commits, | |
1435 | transport->remote->name, | |
1436 | &needs_pushing)) { | |
910650d2 | 1437 | oid_array_clear(&commits); |
360c7ba3 | 1438 | trace2_region_leave("transport_push", "check_submodules", r); |
6448182a | 1439 | die_with_unpushed_submodules(&needs_pushing); |
d2b17b32 | 1440 | } |
6448182a FH |
1441 | string_list_clear(&needs_pushing, 0); |
1442 | oid_array_clear(&commits); | |
1443 | trace2_region_leave("transport_push", "check_submodules", r); | |
1444 | } | |
d2b17b32 | 1445 | |
6448182a FH |
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 | } | |
64fcef2d | 1469 | |
6448182a FH |
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"); | |
77555854 | 1474 | |
35919bf1 | 1475 | done: |
8c49d704 FH |
1476 | free_refs(local_refs); |
1477 | free_refs(remote_refs); | |
6448182a | 1478 | return ret; |
9b288516 DB |
1479 | } |
1480 | ||
1af8ae1c | 1481 | const struct ref *transport_get_remote_refs(struct transport *transport, |
39835409 | 1482 | struct transport_ls_refs_options *transport_options) |
c29727d5 | 1483 | { |
b0d66e15 | 1484 | if (!transport->got_remote_refs) { |
1af8ae1c BW |
1485 | transport->remote_refs = |
1486 | transport->vtable->get_refs_list(transport, 0, | |
39835409 | 1487 | transport_options); |
b0d66e15 TRC |
1488 | transport->got_remote_refs = 1; |
1489 | } | |
61b075bd | 1490 | |
c29727d5 DB |
1491 | return transport->remote_refs; |
1492 | } | |
1493 | ||
f36d4f83 ÆAB |
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 | ||
e2842b39 | 1500 | int transport_fetch_refs(struct transport *transport, struct ref *refs) |
c29727d5 | 1501 | { |
425b1393 | 1502 | int rc; |
86386829 | 1503 | int nr_heads = 0, nr_alloc = 0, nr_refs = 0; |
37148311 DB |
1504 | struct ref **heads = NULL; |
1505 | struct ref *rm; | |
c29727d5 DB |
1506 | |
1507 | for (rm = refs; rm; rm = rm->next) { | |
86386829 | 1508 | nr_refs++; |
c29727d5 | 1509 | if (rm->peer_ref && |
f4e54d02 | 1510 | !is_null_oid(&rm->old_oid) && |
4a7e27e9 | 1511 | oideq(&rm->peer_ref->old_oid, &rm->old_oid)) |
c29727d5 | 1512 | continue; |
7a2bff45 | 1513 | ALLOC_GROW(heads, nr_heads + 1, nr_alloc); |
425b1393 | 1514 | heads[nr_heads++] = rm; |
c29727d5 DB |
1515 | } |
1516 | ||
86386829 NP |
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 | |
09b7e220 | 1523 | * (see builtin/fetch.c:quickfetch()). |
86386829 | 1524 | */ |
b32fa95f | 1525 | ALLOC_ARRAY(heads, nr_refs); |
86386829 NP |
1526 | for (rm = refs; rm; rm = rm->next) |
1527 | heads[nr_heads++] = rm; | |
1528 | } | |
1529 | ||
9b1cdd33 | 1530 | rc = transport->vtable->fetch_refs(transport, nr_heads, heads); |
61b075bd | 1531 | |
c29727d5 | 1532 | free(heads); |
425b1393 | 1533 | return rc; |
c29727d5 DB |
1534 | } |
1535 | ||
0cfde740 ÆAB |
1536 | int transport_get_remote_bundle_uri(struct transport *transport) |
1537 | { | |
7cce9074 | 1538 | int value = 0; |
0cfde740 ÆAB |
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 | ||
7cce9074 ÆAB |
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 | ||
ebc39479 DS |
1553 | if (!transport->bundles->baseURI) |
1554 | transport->bundles->baseURI = xstrdup(transport->url); | |
1555 | ||
0cfde740 ÆAB |
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 | ||
58d4d7f1 | 1564 | void transport_unlock_pack(struct transport *transport, unsigned int flags) |
1788c39c | 1565 | { |
58d4d7f1 | 1566 | int in_signal_handler = !!(flags & TRANSPORT_UNLOCK_PACK_IN_SIGNAL_HANDLER); |
9da69a65 JT |
1567 | int i; |
1568 | ||
1569 | for (i = 0; i < transport->pack_lockfiles.nr; i++) | |
58d4d7f1 PS |
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); | |
1788c39c SP |
1576 | } |
1577 | ||
b236752a IL |
1578 | int transport_connect(struct transport *transport, const char *name, |
1579 | const char *exec, int fd[2]) | |
1580 | { | |
e967ca38 JT |
1581 | if (transport->vtable->connect) |
1582 | return transport->vtable->connect(transport, name, exec, fd); | |
b236752a | 1583 | else |
68e39e41 | 1584 | die(_("operation not supported by protocol")); |
b236752a IL |
1585 | } |
1586 | ||
9b288516 DB |
1587 | int transport_disconnect(struct transport *transport) |
1588 | { | |
1589 | int ret = 0; | |
e967ca38 JT |
1590 | if (transport->vtable->disconnect) |
1591 | ret = transport->vtable->disconnect(transport); | |
68ffe095 AH |
1592 | if (transport->got_remote_refs) |
1593 | free_refs((void *)transport->remote_refs); | |
0cfde740 ÆAB |
1594 | clear_bundle_list(transport->bundles); |
1595 | free(transport->bundles); | |
9b288516 DB |
1596 | free(transport); |
1597 | return ret; | |
1598 | } | |
47abd85b AE |
1599 | |
1600 | /* | |
a7793a74 | 1601 | * Strip username (and password) from a URL and return |
47abd85b AE |
1602 | * it in a newly allocated string. |
1603 | */ | |
1604 | char *transport_anonymize_url(const char *url) | |
1605 | { | |
21f9d0f6 | 1606 | char *scheme_prefix, *anon_part; |
47abd85b AE |
1607 | size_t anon_len, prefix_len = 0; |
1608 | ||
1609 | anon_part = strchr(url, '@'); | |
c59ab2e5 | 1610 | if (url_is_local_not_ssh(url) || !anon_part) |
47abd85b AE |
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 | } | |
21f9d0f6 JK |
1640 | return xstrfmt("%.*s%.*s", (int)prefix_len, url, |
1641 | (int)anon_len, anon_part); | |
47abd85b AE |
1642 | literal_copy: |
1643 | return xstrdup(url); | |
1644 | } |