]> git.ipfire.org Git - thirdparty/git.git/blame - builtin/send-pack.c
revision: add --grep-reflog to filter commits by reflog messages
[thirdparty/git.git] / builtin / send-pack.c
CommitLineData
c2e86add 1#include "builtin.h"
2a9c3fe8 2#include "commit.h"
584c6cc9 3#include "refs.h"
f3a3214e 4#include "pkt-line.h"
de1a2fdd 5#include "sideband.h"
38b1c662 6#include "run-command.h"
6b62816c 7#include "remote.h"
96249c04 8#include "send-pack.h"
de1a2fdd 9#include "quote.h"
f1863d0d 10#include "transport.h"
ff5effdf 11#include "version.h"
61221472 12
2a245013 13static const char send_pack_usage[] =
1b1dd23f 14"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
18bd8821 15" --all and explicit <ref> specification are mutually exclusive.";
96249c04 16
6828f72f 17static struct send_pack_args args;
61221472 18
02322e16
JH
19static int feed_object(const unsigned char *sha1, int fd, int negative)
20{
21 char buf[42];
22
23 if (negative && !has_sha1_file(sha1))
24 return 1;
25
26 memcpy(buf + negative, sha1_to_hex(sha1), 40);
27 if (negative)
28 buf[0] = '^';
29 buf[40 + negative] = '\n';
30 return write_or_whine(fd, buf, 41 + negative, "send-pack: send refs");
31}
32
c727fe2a 33/*
0ae5f98c 34 * Make a pack stream and spit it out into file descriptor fd
c727fe2a 35 */
64fcef2d 36static int pack_objects(int fd, struct ref *refs, struct extra_have_objects *extra, struct send_pack_args *args)
c727fe2a 37{
38b1c662
SP
38 /*
39 * The child becomes pack-objects --revs; we feed
40 * the revision parameters to it via its stdin and
41 * let its stdout go back to the other end.
42 */
96249c04 43 const char *argv[] = {
38b1c662 44 "pack-objects",
4f366275 45 "--all-progress-implied",
38b1c662
SP
46 "--revs",
47 "--stdout",
48 NULL,
49 NULL,
b74fce16 50 NULL,
12070329 51 NULL,
d7c411b7 52 NULL,
38b1c662
SP
53 };
54 struct child_process po;
40c155ff 55 int i;
c727fe2a 56
b74fce16 57 i = 4;
64fcef2d 58 if (args->use_thin_pack)
b74fce16
NP
59 argv[i++] = "--thin";
60 if (args->use_ofs_delta)
61 argv[i++] = "--delta-base-offset";
01fdc21f 62 if (args->quiet || !args->progress)
12070329 63 argv[i++] = "-q";
d7c411b7
JK
64 if (args->progress)
65 argv[i++] = "--progress";
38b1c662 66 memset(&po, 0, sizeof(po));
96249c04 67 po.argv = argv;
38b1c662 68 po.in = -1;
de1a2fdd 69 po.out = args->stateless_rpc ? -1 : fd;
38b1c662
SP
70 po.git_cmd = 1;
71 if (start_command(&po))
d824cbba 72 die_errno("git pack-objects failed");
c727fe2a 73
0ae5f98c
JH
74 /*
75 * We feed the pack-objects we just spawned with revision
76 * parameters by writing to the pipe.
c727fe2a 77 */
02322e16
JH
78 for (i = 0; i < extra->nr; i++)
79 if (!feed_object(extra->array[i], po.in, 1))
40c155ff 80 break;
c727fe2a 81
40c155ff 82 while (refs) {
c727fe2a 83 if (!is_null_sha1(refs->old_sha1) &&
02322e16
JH
84 !feed_object(refs->old_sha1, po.in, 1))
85 break;
86 if (!is_null_sha1(refs->new_sha1) &&
87 !feed_object(refs->new_sha1, po.in, 0))
88 break;
c727fe2a
AW
89 refs = refs->next;
90 }
c727fe2a 91
e72ae288 92 close(po.in);
de1a2fdd
SP
93
94 if (args->stateless_rpc) {
95 char *buf = xmalloc(LARGE_PACKET_MAX);
96 while (1) {
97 ssize_t n = xread(po.out, buf, LARGE_PACKET_MAX);
98 if (n <= 0)
99 break;
100 send_sideband(fd, -1, buf, n, LARGE_PACKET_MAX);
101 }
102 free(buf);
103 close(po.out);
104 po.out = -1;
105 }
106
38b1c662 107 if (finish_command(&po))
64f003ab 108 return -1;
38b1c662 109 return 0;
94fdb7aa 110}
e4b5c7ff 111
ca74c458
JK
112static int receive_status(int in, struct ref *refs)
113{
114 struct ref *hint;
cfee10a7
JH
115 char line[1000];
116 int ret = 0;
117 int len = packet_read_line(in, line, sizeof(line));
2a0fe89a
JK
118 if (len < 10 || memcmp(line, "unpack ", 7))
119 return error("did not receive remote status");
cfee10a7 120 if (memcmp(line, "unpack ok\n", 10)) {
2a0fe89a
JK
121 char *p = line + strlen(line) - 1;
122 if (*p == '\n')
123 *p = '\0';
124 error("unpack failed: %s", line + 7);
cfee10a7
JH
125 ret = -1;
126 }
ca74c458 127 hint = NULL;
cfee10a7 128 while (1) {
2a0fe89a
JK
129 char *refname;
130 char *msg;
cfee10a7
JH
131 len = packet_read_line(in, line, sizeof(line));
132 if (!len)
133 break;
134 if (len < 3 ||
2a0fe89a 135 (memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
cfee10a7
JH
136 fprintf(stderr, "protocol error: %s\n", line);
137 ret = -1;
138 break;
139 }
2a0fe89a
JK
140
141 line[strlen(line)-1] = '\0';
142 refname = line + 3;
143 msg = strchr(refname, ' ');
144 if (msg)
145 *msg++ = '\0';
146
147 /* first try searching at our hint, falling back to all refs */
ca74c458 148 if (hint)
2a0fe89a 149 hint = find_ref_by_name(hint, refname);
ca74c458 150 if (!hint)
2a0fe89a
JK
151 hint = find_ref_by_name(refs, refname);
152 if (!hint) {
153 warning("remote reported status on unknown ref: %s",
154 refname);
155 continue;
156 }
157 if (hint->status != REF_STATUS_EXPECTING_REPORT) {
158 warning("remote reported status on unexpected ref: %s",
159 refname);
160 continue;
161 }
162
163 if (line[0] == 'o' && line[1] == 'k')
164 hint->status = REF_STATUS_OK;
165 else {
166 hint->status = REF_STATUS_REMOTE_REJECT;
167 ret = -1;
168 }
169 if (msg)
170 hint->remote_status = xstrdup(msg);
171 /* start our next search from the next ref */
172 hint = hint->next;
cfee10a7
JH
173 }
174 return ret;
175}
176
de1a2fdd
SP
177static void print_helper_status(struct ref *ref)
178{
179 struct strbuf buf = STRBUF_INIT;
180
181 for (; ref; ref = ref->next) {
182 const char *msg = NULL;
183 const char *res;
184
185 switch(ref->status) {
186 case REF_STATUS_NONE:
187 res = "error";
188 msg = "no match";
189 break;
190
191 case REF_STATUS_OK:
192 res = "ok";
193 break;
194
195 case REF_STATUS_UPTODATE:
196 res = "ok";
197 msg = "up to date";
198 break;
199
200 case REF_STATUS_REJECT_NONFASTFORWARD:
201 res = "error";
202 msg = "non-fast forward";
203 break;
204
205 case REF_STATUS_REJECT_NODELETE:
206 case REF_STATUS_REMOTE_REJECT:
207 res = "error";
208 break;
209
210 case REF_STATUS_EXPECTING_REPORT:
211 default:
212 continue;
213 }
214
215 strbuf_reset(&buf);
216 strbuf_addf(&buf, "%s %s", res, ref->name);
217 if (ref->remote_status)
218 msg = ref->remote_status;
219 if (msg) {
220 strbuf_addch(&buf, ' ');
221 quote_two_c_style(&buf, "", msg, 0);
222 }
223 strbuf_addch(&buf, '\n');
224
225 safe_write(1, buf.buf, buf.len);
226 }
227 strbuf_release(&buf);
228}
229
0c499ea6
SP
230static int sideband_demux(int in, int out, void *data)
231{
61432146 232 int *fd = data, ret;
73776dc1 233#ifdef NO_PTHREADS
09c9957c
JS
234 close(fd[1]);
235#endif
61432146 236 ret = recv_sideband("send-pack", fd[0], out);
0c499ea6
SP
237 close(out);
238 return ret;
239}
240
64fcef2d
DB
241int send_pack(struct send_pack_args *args,
242 int fd[], struct child_process *conn,
243 struct ref *remote_refs,
244 struct extra_have_objects *extra_have)
61221472 245{
64fcef2d
DB
246 int in = fd[0];
247 int out = fd[1];
de1a2fdd 248 struct strbuf req_buf = STRBUF_INIT;
64fcef2d 249 struct ref *ref;
584c6cc9 250 int new_refs;
d4f694ba 251 int allow_deleting_refs = 0;
0c499ea6
SP
252 int status_report = 0;
253 int use_sideband = 0;
01fdc21f 254 int quiet_supported = 0;
d50c3871 255 int agent_supported = 0;
0c499ea6 256 unsigned cmds_sent = 0;
ca74c458 257 int ret;
0c499ea6 258 struct async demux;
584c6cc9 259
cfee10a7
JH
260 /* Does the other end support the reporting? */
261 if (server_supports("report-status"))
0c499ea6 262 status_report = 1;
d4f694ba
JH
263 if (server_supports("delete-refs"))
264 allow_deleting_refs = 1;
b74fce16
NP
265 if (server_supports("ofs-delta"))
266 args->use_ofs_delta = 1;
0c499ea6
SP
267 if (server_supports("side-band-64k"))
268 use_sideband = 1;
01fdc21f
CB
269 if (server_supports("quiet"))
270 quiet_supported = 1;
d50c3871
JK
271 if (server_supports("agent"))
272 agent_supported = 1;
cfee10a7 273
4c353e89 274 if (!remote_refs) {
7e23b06d
AC
275 fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
276 "Perhaps you should specify a branch such as 'master'.\n");
4c353e89
DB
277 return 0;
278 }
279
584c6cc9 280 /*
f88395ac 281 * Finally, tell the other end!
584c6cc9 282 */
f88395ac
JH
283 new_refs = 0;
284 for (ref = remote_refs; ref; ref = ref->next) {
20e8b465 285 if (!ref->peer_ref && !args->send_mirror)
16ed2f48 286 continue;
28b9d6e5 287
20e8b465
TRC
288 /* Check for statuses set by set_ref_status_for_push() */
289 switch (ref->status) {
290 case REF_STATUS_REJECT_NONFASTFORWARD:
291 case REF_STATUS_UPTODATE:
37fde874 292 continue;
20e8b465
TRC
293 default:
294 ; /* do nothing */
37fde874
JH
295 }
296
20e8b465
TRC
297 if (ref->deletion && !allow_deleting_refs) {
298 ref->status = REF_STATUS_REJECT_NODELETE;
8736a848 299 continue;
e4b5c7ff 300 }
8736a848 301
8736a848 302 if (!ref->deletion)
d4f694ba 303 new_refs++;
cfee10a7 304
0c499ea6
SP
305 if (args->dry_run) {
306 ref->status = REF_STATUS_OK;
307 } else {
8736a848
JK
308 char *old_hex = sha1_to_hex(ref->old_sha1);
309 char *new_hex = sha1_to_hex(ref->new_sha1);
01fdc21f 310 int quiet = quiet_supported && (args->quiet || !args->progress);
8736a848 311
d50c3871
JK
312 if (!cmds_sent && (status_report || use_sideband ||
313 quiet || agent_supported)) {
ff5effdf 314 packet_buf_write(&req_buf,
d50c3871 315 "%s %s %s%c%s%s%s%s%s",
01fdc21f
CB
316 old_hex, new_hex, ref->name, 0,
317 status_report ? " report-status" : "",
318 use_sideband ? " side-band-64k" : "",
ff5effdf 319 quiet ? " quiet" : "",
d50c3871
JK
320 agent_supported ? " agent=" : "",
321 agent_supported ? git_user_agent_sanitized() : ""
322 );
a63103ae
BE
323 }
324 else
de1a2fdd 325 packet_buf_write(&req_buf, "%s %s %s",
01fdc21f 326 old_hex, new_hex, ref->name);
0c499ea6
SP
327 ref->status = status_report ?
328 REF_STATUS_EXPECTING_REPORT :
329 REF_STATUS_OK;
330 cmds_sent++;
cfee10a7 331 }
61221472 332 }
f88395ac 333
de1a2fdd 334 if (args->stateless_rpc) {
0c499ea6 335 if (!args->dry_run && cmds_sent) {
de1a2fdd
SP
336 packet_buf_flush(&req_buf);
337 send_sideband(out, -1, req_buf.buf, req_buf.len, LARGE_PACKET_MAX);
338 }
339 } else {
340 safe_write(out, req_buf.buf, req_buf.len);
341 packet_flush(out);
342 }
343 strbuf_release(&req_buf);
344
0c499ea6
SP
345 if (use_sideband && cmds_sent) {
346 memset(&demux, 0, sizeof(demux));
347 demux.proc = sideband_demux;
348 demux.data = fd;
349 demux.out = -1;
350 if (start_async(&demux))
e6bcd979 351 die("send-pack: unable to fork off sideband demultiplexer");
0c499ea6
SP
352 in = demux.out;
353 }
354
355 if (new_refs && cmds_sent) {
64fcef2d
DB
356 if (pack_objects(out, remote_refs, extra_have, args) < 0) {
357 for (ref = remote_refs; ref; ref = ref->next)
358 ref->status = REF_STATUS_NONE;
e07fd15b
JK
359 if (args->stateless_rpc)
360 close(out);
a1a3fd1f
JK
361 if (git_connection_is_socket(conn))
362 shutdown(fd[0], SHUT_WR);
0c499ea6
SP
363 if (use_sideband)
364 finish_async(&demux);
8736a848 365 return -1;
64fcef2d 366 }
8736a848 367 }
0c499ea6 368 if (args->stateless_rpc && cmds_sent)
de1a2fdd 369 packet_flush(out);
cfee10a7 370
0c499ea6 371 if (status_report && cmds_sent)
ca74c458 372 ret = receive_status(in, remote_refs);
ca74c458
JK
373 else
374 ret = 0;
de1a2fdd
SP
375 if (args->stateless_rpc)
376 packet_flush(out);
ca74c458 377
0c499ea6
SP
378 if (use_sideband && cmds_sent) {
379 if (finish_async(&demux)) {
380 error("error in sideband demultiplexer");
381 ret = -1;
382 }
383 close(demux.out);
384 }
385
ca74c458
JK
386 if (ret < 0)
387 return ret;
77555854
LA
388
389 if (args->porcelain)
390 return 0;
391
8736a848
JK
392 for (ref = remote_refs; ref; ref = ref->next) {
393 switch (ref->status) {
394 case REF_STATUS_NONE:
395 case REF_STATUS_UPTODATE:
396 case REF_STATUS_OK:
397 break;
398 default:
399 return -1;
400 }
401 }
402 return 0;
61221472
LT
403}
404
96249c04 405int cmd_send_pack(int argc, const char **argv, const char *prefix)
61221472 406{
64fcef2d
DB
407 int i, nr_refspecs = 0;
408 const char **refspecs = NULL;
96249c04 409 const char *remote_name = NULL;
b516968f 410 struct remote *remote = NULL;
96249c04 411 const char *dest = NULL;
64fcef2d
DB
412 int fd[2];
413 struct child_process *conn;
414 struct extra_have_objects extra_have;
6d2bf96e 415 struct ref *remote_refs, *local_refs;
64fcef2d 416 int ret;
de1a2fdd 417 int helper_status = 0;
64fcef2d
DB
418 int send_all = 0;
419 const char *receivepack = "git-receive-pack";
420 int flags;
f1863d0d 421 int nonfastforward = 0;
391b1f20 422 int progress = -1;
84a9b58c 423
61221472 424 argv++;
d089391c 425 for (i = 1; i < argc; i++, argv++) {
96249c04 426 const char *arg = *argv;
61221472
LT
427
428 if (*arg == '-') {
cc44c765 429 if (!prefixcmp(arg, "--receive-pack=")) {
64fcef2d 430 receivepack = arg + 15;
d23842fd
UKK
431 continue;
432 }
cc44c765 433 if (!prefixcmp(arg, "--exec=")) {
64fcef2d 434 receivepack = arg + 7;
61221472
LT
435 continue;
436 }
b516968f
DB
437 if (!prefixcmp(arg, "--remote=")) {
438 remote_name = arg + 9;
439 continue;
440 }
d089391c 441 if (!strcmp(arg, "--all")) {
64fcef2d 442 send_all = 1;
d089391c
LT
443 continue;
444 }
a63103ae 445 if (!strcmp(arg, "--dry-run")) {
96249c04 446 args.dry_run = 1;
a63103ae
BE
447 continue;
448 }
28b9d6e5
AW
449 if (!strcmp(arg, "--mirror")) {
450 args.send_mirror = 1;
451 continue;
452 }
2a9c3fe8 453 if (!strcmp(arg, "--force")) {
96249c04 454 args.force_update = 1;
2a9c3fe8
LT
455 continue;
456 }
c207e34f
CB
457 if (!strcmp(arg, "--quiet")) {
458 args.quiet = 1;
459 continue;
460 }
41f93a2c 461 if (!strcmp(arg, "--verbose")) {
96249c04 462 args.verbose = 1;
41f93a2c
LT
463 continue;
464 }
391b1f20
JK
465 if (!strcmp(arg, "--progress")) {
466 progress = 1;
467 continue;
468 }
469 if (!strcmp(arg, "--no-progress")) {
470 progress = 0;
471 continue;
472 }
2245be3e 473 if (!strcmp(arg, "--thin")) {
96249c04 474 args.use_thin_pack = 1;
2245be3e
JH
475 continue;
476 }
de1a2fdd
SP
477 if (!strcmp(arg, "--stateless-rpc")) {
478 args.stateless_rpc = 1;
479 continue;
480 }
481 if (!strcmp(arg, "--helper-status")) {
482 helper_status = 1;
483 continue;
484 }
61221472
LT
485 usage(send_pack_usage);
486 }
d089391c
LT
487 if (!dest) {
488 dest = arg;
489 continue;
490 }
64fcef2d
DB
491 refspecs = (const char **) argv;
492 nr_refspecs = argc - i;
61221472
LT
493 break;
494 }
495 if (!dest)
496 usage(send_pack_usage);
28b9d6e5
AW
497 /*
498 * --all and --mirror are incompatible; neither makes sense
499 * with any refspecs.
500 */
64fcef2d
DB
501 if ((refspecs && (send_all || args.send_mirror)) ||
502 (send_all && args.send_mirror))
0bc3cdfc 503 usage(send_pack_usage);
37adac76 504
b516968f
DB
505 if (remote_name) {
506 remote = remote_get(remote_name);
28b91f8a 507 if (!remote_has_url(remote, dest)) {
b516968f
DB
508 die("Destination %s is not a uri for %s",
509 dest, remote_name);
510 }
511 }
512
391b1f20
JK
513 if (progress == -1)
514 progress = !args.quiet && isatty(2);
515 args.progress = progress;
8d32e60d 516
de1a2fdd
SP
517 if (args.stateless_rpc) {
518 conn = NULL;
519 fd[0] = 0;
520 fd[1] = 1;
521 } else {
5a277f3f 522 conn = git_connect(fd, dest, receivepack,
de1a2fdd
SP
523 args.verbose ? CONNECT_VERBOSE : 0);
524 }
96249c04 525
64fcef2d
DB
526 memset(&extra_have, 0, sizeof(extra_have));
527
afe7c5ff 528 get_remote_heads(fd[0], &remote_refs, REF_NORMAL, &extra_have);
64fcef2d 529
f1863d0d 530 transport_verify_remote_names(nr_refspecs, refspecs);
64fcef2d
DB
531
532 local_refs = get_local_heads();
96249c04 533
64fcef2d
DB
534 flags = MATCH_REFS_NONE;
535
536 if (send_all)
537 flags |= MATCH_REFS_ALL;
538 if (args.send_mirror)
539 flags |= MATCH_REFS_MIRROR;
540
541 /* match them up */
29753cdd 542 if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags))
64fcef2d 543 return -1;
96249c04 544
20e8b465
TRC
545 set_ref_status_for_push(remote_refs, args.send_mirror,
546 args.force_update);
547
64fcef2d 548 ret = send_pack(&args, fd, conn, remote_refs, &extra_have);
96249c04 549
de1a2fdd
SP
550 if (helper_status)
551 print_helper_status(remote_refs);
552
64fcef2d 553 close(fd[1]);
7f8e9828 554 close(fd[0]);
64fcef2d 555
98158e9c 556 ret |= finish_connect(conn);
64fcef2d 557
de1a2fdd 558 if (!helper_status)
f1863d0d 559 transport_print_push_status(dest, remote_refs, args.verbose, 0, &nonfastforward);
64fcef2d
DB
560
561 if (!args.dry_run && remote) {
562 struct ref *ref;
563 for (ref = remote_refs; ref; ref = ref->next)
f1863d0d 564 transport_update_tracking_ref(remote, ref, args.verbose);
64fcef2d
DB
565 }
566
f1863d0d 567 if (!ret && !transport_refs_pushed(remote_refs))
64fcef2d
DB
568 fprintf(stderr, "Everything up-to-date\n");
569
570 return ret;
61221472 571}