send-pack: read "unpack" status even on pack-objects failure
[git/git.git] / send-pack.c
CommitLineData
f5d942e1
NTND
1#include "builtin.h"
2#include "commit.h"
3#include "refs.h"
4#include "pkt-line.h"
5#include "sideband.h"
6#include "run-command.h"
7#include "remote.h"
47a59185 8#include "connect.h"
f5d942e1
NTND
9#include "send-pack.h"
10#include "quote.h"
11#include "transport.h"
12#include "version.h"
13eb4626 13#include "sha1-array.h"
a85b377d 14#include "gpg-interface.h"
30261094
DB
15#include "cache.h"
16
17int option_parse_push_signed(const struct option *opt,
18 const char *arg, int unset)
19{
20 if (unset) {
21 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_NEVER;
22 return 0;
23 }
24 switch (git_parse_maybe_bool(arg)) {
25 case 1:
26 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_ALWAYS;
27 return 0;
28 case 0:
29 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_NEVER;
30 return 0;
31 }
32 if (!strcasecmp("if-asked", arg)) {
33 *(int *)(opt->value) = SEND_PACK_PUSH_CERT_IF_ASKED;
34 return 0;
35 }
36 die("bad %s argument: %s", opt->long_name, arg);
37}
f5d942e1 38
f0bca72d 39static void feed_object(const unsigned char *sha1, FILE *fh, int negative)
f5d942e1 40{
f5d942e1 41 if (negative && !has_sha1_file(sha1))
f0bca72d 42 return;
f5d942e1 43
f5d942e1 44 if (negative)
f0bca72d
JK
45 putc('^', fh);
46 fputs(sha1_to_hex(sha1), fh);
47 putc('\n', fh);
f5d942e1
NTND
48}
49
50/*
51 * Make a pack stream and spit it out into file descriptor fd
52 */
13eb4626 53static int pack_objects(int fd, struct ref *refs, struct sha1_array *extra, struct send_pack_args *args)
f5d942e1
NTND
54{
55 /*
56 * The child becomes pack-objects --revs; we feed
57 * the revision parameters to it via its stdin and
58 * let its stdout go back to the other end.
59 */
60 const char *argv[] = {
61 "pack-objects",
62 "--all-progress-implied",
63 "--revs",
64 "--stdout",
65 NULL,
66 NULL,
67 NULL,
68 NULL,
69 NULL,
2dacf26d 70 NULL,
f5d942e1 71 };
d3180279 72 struct child_process po = CHILD_PROCESS_INIT;
f0bca72d 73 FILE *po_in;
f5d942e1
NTND
74 int i;
75
76 i = 4;
77 if (args->use_thin_pack)
78 argv[i++] = "--thin";
79 if (args->use_ofs_delta)
80 argv[i++] = "--delta-base-offset";
81 if (args->quiet || !args->progress)
82 argv[i++] = "-q";
83 if (args->progress)
84 argv[i++] = "--progress";
2dacf26d 85 if (is_repository_shallow())
86 argv[i++] = "--shallow";
f5d942e1
NTND
87 po.argv = argv;
88 po.in = -1;
89 po.out = args->stateless_rpc ? -1 : fd;
90 po.git_cmd = 1;
91 if (start_command(&po))
92 die_errno("git pack-objects failed");
93
94 /*
95 * We feed the pack-objects we just spawned with revision
96 * parameters by writing to the pipe.
97 */
f0bca72d 98 po_in = xfdopen(po.in, "w");
f5d942e1 99 for (i = 0; i < extra->nr; i++)
f0bca72d 100 feed_object(extra->sha1[i], po_in, 1);
f5d942e1
NTND
101
102 while (refs) {
f0bca72d
JK
103 if (!is_null_oid(&refs->old_oid))
104 feed_object(refs->old_oid.hash, po_in, 1);
105 if (!is_null_oid(&refs->new_oid))
106 feed_object(refs->new_oid.hash, po_in, 0);
f5d942e1
NTND
107 refs = refs->next;
108 }
109
f0bca72d
JK
110 fflush(po_in);
111 if (ferror(po_in))
112 die_errno("error writing to pack-objects");
113 fclose(po_in);
f5d942e1
NTND
114
115 if (args->stateless_rpc) {
116 char *buf = xmalloc(LARGE_PACKET_MAX);
117 while (1) {
118 ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
119 if (n <= 0)
120 break;
121 send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
122 }
123 free(buf);
124 close(po.out);
125 po.out = -1;
126 }
127
128 if (finish_command(&po))
129 return -1;
130 return 0;
131}
132
7c39df29 133static int receive_unpack_status(int in)
f5d942e1 134{
7c39df29 135 const char *line = packet_read_line(in, NULL);
f7cd74d1 136 if (!skip_prefix(line, "unpack ", &line))
40d05d04 137 return error(_("unable to parse remote unpack status: %s"), line);
f7cd74d1 138 if (strcmp(line, "ok"))
40d05d04 139 return error(_("remote unpack failed: %s"), line);
7c39df29
JK
140 return 0;
141}
142
143static int receive_status(int in, struct ref *refs)
144{
145 struct ref *hint;
146 int ret;
147
f5d942e1 148 hint = NULL;
7c39df29 149 ret = receive_unpack_status(in);
f5d942e1
NTND
150 while (1) {
151 char *refname;
152 char *msg;
7c39df29 153 char *line = packet_read_line(in, NULL);
74543a04 154 if (!line)
f5d942e1 155 break;
59556548 156 if (!starts_with(line, "ok ") && !starts_with(line, "ng ")) {
8f9e3e49 157 error("invalid ref status from remote: %s", line);
f5d942e1
NTND
158 ret = -1;
159 break;
160 }
161
f5d942e1
NTND
162 refname = line + 3;
163 msg = strchr(refname, ' ');
164 if (msg)
165 *msg++ = '\0';
166
167 /* first try searching at our hint, falling back to all refs */
168 if (hint)
169 hint = find_ref_by_name(hint, refname);
170 if (!hint)
171 hint = find_ref_by_name(refs, refname);
172 if (!hint) {
173 warning("remote reported status on unknown ref: %s",
174 refname);
175 continue;
176 }
177 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
178 warning("remote reported status on unexpected ref: %s",
179 refname);
180 continue;
181 }
182
183 if (line[0] == 'o' && line[1] == 'k')
184 hint->status = REF_STATUS_OK;
185 else {
186 hint->status = REF_STATUS_REMOTE_REJECT;
187 ret = -1;
188 }
13092a91 189 hint->remote_status = xstrdup_or_null(msg);
f5d942e1
NTND
190 /* start our next search from the next ref */
191 hint = hint->next;
192 }
193 return ret;
194}
195
196static int sideband_demux(int in, int out, void *data)
197{
198 int *fd = data, ret;
199#ifdef NO_PTHREADS
200 close(fd[1]);
201#endif
202 ret = recv_sideband("send-pack", fd[0], out);
203 close(out);
204 return ret;
205}
206
f2c681cf
NTND
207static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb)
208{
209 struct strbuf *sb = cb;
210 if (graft->nr_parent == -1)
7683e2e6 211 packet_buf_write(sb, "shallow %s\n", oid_to_hex(&graft->oid));
f2c681cf
NTND
212 return 0;
213}
214
16a2743c 215static void advertise_shallow_grafts_buf(struct strbuf *sb)
f2c681cf
NTND
216{
217 if (!is_repository_shallow())
218 return;
219 for_each_commit_graft(advertise_shallow_grafts_cb, sb);
220}
221
7582e939
SB
222#define CHECK_REF_NO_PUSH -1
223#define CHECK_REF_STATUS_REJECTED -2
224#define CHECK_REF_UPTODATE -3
225static int check_to_send_update(const struct ref *ref, const struct send_pack_args *args)
e40671a3
JH
226{
227 if (!ref->peer_ref && !args->send_mirror)
7582e939 228 return CHECK_REF_NO_PUSH;
e40671a3
JH
229
230 /* Check for statuses set by set_ref_status_for_push() */
231 switch (ref->status) {
232 case REF_STATUS_REJECT_NONFASTFORWARD:
233 case REF_STATUS_REJECT_ALREADY_EXISTS:
234 case REF_STATUS_REJECT_FETCH_FIRST:
235 case REF_STATUS_REJECT_NEEDS_FORCE:
236 case REF_STATUS_REJECT_STALE:
237 case REF_STATUS_REJECT_NODELETE:
7582e939 238 return CHECK_REF_STATUS_REJECTED;
e40671a3 239 case REF_STATUS_UPTODATE:
7582e939 240 return CHECK_REF_UPTODATE;
e40671a3 241 default:
7582e939 242 return 0;
e40671a3
JH
243 }
244}
245
a85b377d
JH
246/*
247 * the beginning of the next line, or the end of buffer.
248 *
249 * NEEDSWORK: perhaps move this to git-compat-util.h or somewhere and
250 * convert many similar uses found by "git grep -A4 memchr".
251 */
252static const char *next_line(const char *line, size_t len)
253{
254 const char *nl = memchr(line, '\n', len);
255 if (!nl)
256 return line + len; /* incomplete line */
257 return nl + 1;
258}
259
20a7558f
JH
260static int generate_push_cert(struct strbuf *req_buf,
261 const struct ref *remote_refs,
262 struct send_pack_args *args,
b89363e4
JH
263 const char *cap_string,
264 const char *push_cert_nonce)
a85b377d
JH
265{
266 const struct ref *ref;
f6a4e61f 267 struct string_list_item *item;
a85b377d
JH
268 char *signing_key = xstrdup(get_signing_key());
269 const char *cp, *np;
270 struct strbuf cert = STRBUF_INIT;
271 int update_seen = 0;
272
02962d36 273 strbuf_addstr(&cert, "certificate version 0.1\n");
fb06b528
JH
274 strbuf_addf(&cert, "pusher %s ", signing_key);
275 datestamp(&cert);
276 strbuf_addch(&cert, '\n');
9be89160
JH
277 if (args->url && *args->url) {
278 char *anon_url = transport_anonymize_url(args->url);
279 strbuf_addf(&cert, "pushee %s\n", anon_url);
280 free(anon_url);
281 }
b89363e4
JH
282 if (push_cert_nonce[0])
283 strbuf_addf(&cert, "nonce %s\n", push_cert_nonce);
f6a4e61f
SB
284 if (args->push_options)
285 for_each_string_list_item(item, args->push_options)
286 strbuf_addf(&cert, "push-option %s\n", item->string);
a85b377d
JH
287 strbuf_addstr(&cert, "\n");
288
289 for (ref = remote_refs; ref; ref = ref->next) {
7582e939 290 if (check_to_send_update(ref, args) < 0)
a85b377d
JH
291 continue;
292 update_seen = 1;
293 strbuf_addf(&cert, "%s %s %s\n",
f4e54d02 294 oid_to_hex(&ref->old_oid),
295 oid_to_hex(&ref->new_oid),
a85b377d
JH
296 ref->name);
297 }
298 if (!update_seen)
299 goto free_return;
300
301 if (sign_buffer(&cert, &cert, signing_key))
302 die(_("failed to sign the push certificate"));
303
20a7558f 304 packet_buf_write(req_buf, "push-cert%c%s", 0, cap_string);
a85b377d
JH
305 for (cp = cert.buf; cp < cert.buf + cert.len; cp = np) {
306 np = next_line(cp, cert.buf + cert.len - cp);
307 packet_buf_write(req_buf,
308 "%.*s", (int)(np - cp), cp);
309 }
310 packet_buf_write(req_buf, "push-cert-end\n");
311
312free_return:
313 free(signing_key);
314 strbuf_release(&cert);
20a7558f 315 return update_seen;
a85b377d
JH
316}
317
4ff17f10
RS
318
319static int atomic_push_failure(struct send_pack_args *args,
320 struct ref *remote_refs,
321 struct ref *failing_ref)
322{
323 struct ref *ref;
324 /* Mark other refs as failed */
325 for (ref = remote_refs; ref; ref = ref->next) {
326 if (!ref->peer_ref && !args->send_mirror)
327 continue;
328
329 switch (ref->status) {
330 case REF_STATUS_EXPECTING_REPORT:
331 ref->status = REF_STATUS_ATOMIC_PUSH_FAILED;
332 continue;
333 default:
334 break; /* do nothing */
335 }
336 }
337 return error("atomic push failed for ref %s. status: %d\n",
338 failing_ref->name, failing_ref->status);
339}
340
afcb6ee3
JH
341#define NONCE_LEN_LIMIT 256
342
343static void reject_invalid_nonce(const char *nonce, int len)
344{
345 int i = 0;
346
347 if (NONCE_LEN_LIMIT <= len)
348 die("the receiving end asked to sign an invalid nonce <%.*s>",
349 len, nonce);
350
351 for (i = 0; i < len; i++) {
352 int ch = nonce[i] & 0xFF;
353 if (isalnum(ch) ||
354 ch == '-' || ch == '.' ||
355 ch == '/' || ch == '+' ||
356 ch == '=' || ch == '_')
357 continue;
358 die("the receiving end asked to sign an invalid nonce <%.*s>",
359 len, nonce);
360 }
361}
362
f5d942e1
NTND
363int send_pack(struct send_pack_args *args,
364 int fd[], struct child_process *conn,
365 struct ref *remote_refs,
13eb4626 366 struct sha1_array *extra_have)
f5d942e1
NTND
367{
368 int in = fd[0];
369 int out = fd[1];
370 struct strbuf req_buf = STRBUF_INIT;
887f3533 371 struct strbuf cap_buf = STRBUF_INIT;
f5d942e1 372 struct ref *ref;
ab2b0c90 373 int need_pack_data = 0;
f5d942e1
NTND
374 int allow_deleting_refs = 0;
375 int status_report = 0;
376 int use_sideband = 0;
377 int quiet_supported = 0;
378 int agent_supported = 0;
4ff17f10
RS
379 int use_atomic = 0;
380 int atomic_supported = 0;
f6a4e61f
SB
381 int use_push_options = 0;
382 int push_options_supported = 0;
f5d942e1
NTND
383 unsigned cmds_sent = 0;
384 int ret;
385 struct async demux;
b89363e4 386 const char *push_cert_nonce = NULL;
f5d942e1
NTND
387
388 /* Does the other end support the reporting? */
389 if (server_supports("report-status"))
390 status_report = 1;
391 if (server_supports("delete-refs"))
392 allow_deleting_refs = 1;
393 if (server_supports("ofs-delta"))
394 args->use_ofs_delta = 1;
395 if (server_supports("side-band-64k"))
396 use_sideband = 1;
397 if (server_supports("quiet"))
398 quiet_supported = 1;
399 if (server_supports("agent"))
400 agent_supported = 1;
1ba98a79
CMN
401 if (server_supports("no-thin"))
402 args->use_thin_pack = 0;
4ff17f10
RS
403 if (server_supports("atomic"))
404 atomic_supported = 1;
f6a4e61f
SB
405 if (server_supports("push-options"))
406 push_options_supported = 1;
b89363e4 407
30261094
DB
408 if (args->push_cert != SEND_PACK_PUSH_CERT_NEVER) {
409 int len;
b89363e4 410 push_cert_nonce = server_feature_value("push-cert", &len);
30261094
DB
411 if (push_cert_nonce) {
412 reject_invalid_nonce(push_cert_nonce, len);
413 push_cert_nonce = xmemdupz(push_cert_nonce, len);
414 } else if (args->push_cert == SEND_PACK_PUSH_CERT_ALWAYS) {
b89363e4 415 die(_("the receiving end does not support --signed push"));
30261094
DB
416 } else if (args->push_cert == SEND_PACK_PUSH_CERT_IF_ASKED) {
417 warning(_("not sending a push certificate since the"
418 " receiving end does not support --signed"
419 " push"));
420 }
b89363e4 421 }
f5d942e1
NTND
422
423 if (!remote_refs) {
424 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
425 "Perhaps you should specify a branch such as 'master'.\n");
426 return 0;
427 }
4ff17f10 428 if (args->atomic && !atomic_supported)
c8b8f22a 429 die(_("the receiving end does not support --atomic push"));
4ff17f10
RS
430
431 use_atomic = atomic_supported && args->atomic;
f5d942e1 432
f6a4e61f
SB
433 if (args->push_options && !push_options_supported)
434 die(_("the receiving end does not support push options"));
435
436 use_push_options = push_options_supported && args->push_options;
437
887f3533
JH
438 if (status_report)
439 strbuf_addstr(&cap_buf, " report-status");
440 if (use_sideband)
441 strbuf_addstr(&cap_buf, " side-band-64k");
442 if (quiet_supported && (args->quiet || !args->progress))
443 strbuf_addstr(&cap_buf, " quiet");
4ff17f10
RS
444 if (use_atomic)
445 strbuf_addstr(&cap_buf, " atomic");
f6a4e61f
SB
446 if (use_push_options)
447 strbuf_addstr(&cap_buf, " push-options");
887f3533
JH
448 if (agent_supported)
449 strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());
450
621b0599
JH
451 /*
452 * NEEDSWORK: why does delete-refs have to be so specific to
453 * send-pack machinery that set_ref_status_for_push() cannot
454 * set this bit for us???
455 */
456 for (ref = remote_refs; ref; ref = ref->next)
457 if (ref->deletion && !allow_deleting_refs)
458 ref->status = REF_STATUS_REJECT_NODELETE;
459
5dbd7676 460 if (!args->dry_run)
f2c681cf 461 advertise_shallow_grafts_buf(&req_buf);
5dbd7676 462
30261094 463 if (!args->dry_run && push_cert_nonce)
20a7558f 464 cmds_sent = generate_push_cert(&req_buf, remote_refs, args,
b89363e4 465 cap_buf.buf, push_cert_nonce);
a85b377d 466
f5d942e1 467 /*
b783aa71
JH
468 * Clear the status for each ref and see if we need to send
469 * the pack data.
f5d942e1 470 */
f5d942e1 471 for (ref = remote_refs; ref; ref = ref->next) {
4ff17f10
RS
472 switch (check_to_send_update(ref, args)) {
473 case 0: /* no error */
474 break;
475 case CHECK_REF_STATUS_REJECTED:
476 /*
477 * When we know the server would reject a ref update if
478 * we were to send it and we're trying to send the refs
479 * atomically, abort the whole operation.
480 */
481 if (use_atomic)
482 return atomic_push_failure(args, remote_refs, ref);
483 /* Fallthrough for non atomic case. */
484 default:
f5d942e1 485 continue;
4ff17f10 486 }
f5d942e1 487 if (!ref->deletion)
ab2b0c90 488 need_pack_data = 1;
f5d942e1 489
b783aa71 490 if (args->dry_run || !status_report)
f5d942e1 491 ref->status = REF_STATUS_OK;
b783aa71
JH
492 else
493 ref->status = REF_STATUS_EXPECTING_REPORT;
494 }
495
496 /*
497 * Finally, tell the other end!
498 */
499 for (ref = remote_refs; ref; ref = ref->next) {
500 char *old_hex, *new_hex;
501
30261094 502 if (args->dry_run || push_cert_nonce)
f5d942e1 503 continue;
f5d942e1 504
7582e939 505 if (check_to_send_update(ref, args) < 0)
b783aa71 506 continue;
f5d942e1 507
f4e54d02 508 old_hex = oid_to_hex(&ref->old_oid);
509 new_hex = oid_to_hex(&ref->new_oid);
c67072b9 510 if (!cmds_sent) {
b783aa71
JH
511 packet_buf_write(&req_buf,
512 "%s %s %s%c%s",
513 old_hex, new_hex, ref->name, 0,
514 cap_buf.buf);
c67072b9 515 cmds_sent = 1;
f5d942e1 516 } else {
b783aa71
JH
517 packet_buf_write(&req_buf, "%s %s %s",
518 old_hex, new_hex, ref->name);
f5d942e1
NTND
519 }
520 }
521
522 if (args->stateless_rpc) {
f2c681cf 523 if (!args->dry_run && (cmds_sent || is_repository_shallow())) {
f5d942e1
NTND
524 packet_buf_flush(&req_buf);
525 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
526 }
527 } else {
cdf4fb8e 528 write_or_die(out, req_buf.buf, req_buf.len);
f5d942e1
NTND
529 packet_flush(out);
530 }
531 strbuf_release(&req_buf);
887f3533 532 strbuf_release(&cap_buf);
f5d942e1 533
f6a4e61f
SB
534 if (use_push_options) {
535 struct string_list_item *item;
536 struct strbuf sb = STRBUF_INIT;
537
538 for_each_string_list_item(item, args->push_options)
539 packet_buf_write(&sb, "%s", item->string);
540
541 write_or_die(out, sb.buf, sb.len);
542 packet_flush(out);
543 strbuf_release(&sb);
544 }
545
f5d942e1
NTND
546 if (use_sideband && cmds_sent) {
547 memset(&demux, 0, sizeof(demux));
548 demux.proc = sideband_demux;
549 demux.data = fd;
550 demux.out = -1;
3e8b06d0 551 demux.isolate_sigpipe = 1;
f5d942e1
NTND
552 if (start_async(&demux))
553 die("send-pack: unable to fork off sideband demultiplexer");
554 in = demux.out;
555 }
556
ab2b0c90 557 if (need_pack_data && cmds_sent) {
f5d942e1
NTND
558 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
559 for (ref = remote_refs; ref; ref = ref->next)
560 ref->status = REF_STATUS_NONE;
561 if (args->stateless_rpc)
562 close(out);
563 if (git_connection_is_socket(conn))
564 shutdown(fd[0], SHUT_WR);
ba69f92d
JK
565
566 /*
567 * Do not even bother with the return value; we know we
568 * are failing, and just want the error() side effects.
569 */
570 if (status_report)
571 receive_unpack_status(in);
572
739cf491
JK
573 if (use_sideband) {
574 close(demux.out);
f5d942e1 575 finish_async(&demux);
739cf491 576 }
37cb1dd6 577 fd[1] = -1;
f5d942e1
NTND
578 return -1;
579 }
37cb1dd6
JL
580 if (!args->stateless_rpc)
581 /* Closed by pack_objects() via start_command() */
582 fd[1] = -1;
f5d942e1
NTND
583 }
584 if (args->stateless_rpc && cmds_sent)
585 packet_flush(out);
586
587 if (status_report && cmds_sent)
588 ret = receive_status(in, remote_refs);
589 else
590 ret = 0;
591 if (args->stateless_rpc)
592 packet_flush(out);
593
594 if (use_sideband && cmds_sent) {
739cf491 595 close(demux.out);
f5d942e1
NTND
596 if (finish_async(&demux)) {
597 error("error in sideband demultiplexer");
598 ret = -1;
599 }
f5d942e1
NTND
600 }
601
602 if (ret < 0)
603 return ret;
604
605 if (args->porcelain)
606 return 0;
607
608 for (ref = remote_refs; ref; ref = ref->next) {
609 switch (ref->status) {
610 case REF_STATUS_NONE:
611 case REF_STATUS_UPTODATE:
612 case REF_STATUS_OK:
613 break;
614 default:
615 return -1;
616 }
617 }
618 return 0;
619}