]> git.ipfire.org Git - thirdparty/git.git/blame - upload-pack.c
rev-list: fix finish_object() call
[thirdparty/git.git] / upload-pack.c
CommitLineData
def88e9a
LT
1#include "cache.h"
2#include "refs.h"
3#include "pkt-line.h"
958c24b1 4#include "sideband.h"
f6b42a81
JH
5#include "tag.h"
6#include "object.h"
f0243f26 7#include "commit.h"
77cb17e9 8#include "exec_cmd.h"
9b8dc263
JS
9#include "diff.h"
10#include "revision.h"
11#include "list-objects.h"
cc41fa8d 12#include "run-command.h"
def88e9a 13
62b4698e 14static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>";
def88e9a 15
937a515a
JH
16/* bits #0..7 in revision.h, #8..10 in commit.c */
17#define THEY_HAVE (1u << 11)
18#define OUR_REF (1u << 12)
19#define WANTED (1u << 13)
20#define COMMON_KNOWN (1u << 14)
21#define REACHABLE (1u << 15)
22
f53514bc
JS
23#define SHALLOW (1u << 16)
24#define NOT_SHALLOW (1u << 17)
25#define CLIENT_SHALLOW (1u << 18)
26
3fbe2d54 27static unsigned long oldest_have;
937a515a 28
96f1e58f 29static int multi_ack, nr_our_refs;
4e10cf9a 30static int no_done;
348e390b 31static int use_thin_pack, use_ofs_delta, use_include_tag;
9462e3f5 32static int no_progress, daemon_mode;
f0cea83f 33static int shallow_nr;
b1e9fff7
JH
34static struct object_array have_obj;
35static struct object_array want_obj;
6523078b 36static struct object_array extra_edge_obj;
96f1e58f 37static unsigned int timeout;
d47f3db7
JH
38/* 0 for no sideband,
39 * otherwise maximum packet size (up to 65520 bytes).
40 */
96f1e58f 41static int use_sideband;
49aaddd1 42static int debug_fd;
42526b47
SP
43static int advertise_refs;
44static int stateless_rpc;
960deccb
PA
45
46static void reset_timeout(void)
47{
48 alarm(timeout);
49}
fb9040cc 50
75bfc6c2
LT
51static int strip(char *line, int len)
52{
53 if (len && line[len-1] == '\n')
54 line[--len] = 0;
55 return len;
56}
57
583b7ea3
JH
58static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
59{
958c24b1 60 if (use_sideband)
d47f3db7 61 return send_sideband(1, fd, data, sz, use_sideband);
958c24b1
JH
62 if (fd == 3)
63 /* emergency quit */
64 fd = 2;
65 if (fd == 2) {
93822c22 66 /* XXX: are we happy to lose stuff here? */
958c24b1
JH
67 xwrite(fd, data, sz);
68 return sz;
583b7ea3 69 }
958c24b1 70 return safe_write(fd, data, sz);
583b7ea3
JH
71}
72
16befb8b 73static FILE *pack_pipe = NULL;
11c211fa 74static void show_commit(struct commit *commit, void *data)
9b8dc263
JS
75{
76 if (commit->object.flags & BOUNDARY)
77 fputc('-', pack_pipe);
78 if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
79 die("broken output pipe");
80 fputc('\n', pack_pipe);
81 fflush(pack_pipe);
82 free(commit->buffer);
83 commit->buffer = NULL;
84}
85
cf2ab916 86static void show_object(struct object *obj, const struct name_path *path, const char *component)
9b8dc263
JS
87{
88 /* An object with name "foo\n0000000..." can be used to
89 * confuse downstream git-pack-objects very badly.
90 */
cf2ab916 91 const char *name = path_name(path, component);
8d2dfc49 92 const char *ep = strchr(name, '\n');
9b8dc263 93 if (ep) {
8d2dfc49
LT
94 fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
95 (int) (ep - name),
96 name);
9b8dc263
JS
97 }
98 else
99 fprintf(pack_pipe, "%s %s\n",
8d2dfc49 100 sha1_to_hex(obj->sha1), name);
cf2ab916 101 free((char *)name);
9b8dc263
JS
102}
103
104static void show_edge(struct commit *commit)
105{
106 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
107}
108
1e39d7de 109static int do_rev_list(int in, int out, void *user_data)
80ccaa78
JS
110{
111 int i;
112 struct rev_info revs;
113
ae6a5609 114 pack_pipe = xfdopen(out, "w");
80ccaa78
JS
115 init_revisions(&revs, NULL);
116 revs.tag_objects = 1;
117 revs.tree_objects = 1;
118 revs.blob_objects = 1;
119 if (use_thin_pack)
120 revs.edge_hint = 1;
121
1e39d7de
NTND
122 for (i = 0; i < want_obj.nr; i++) {
123 struct object *o = want_obj.objects[i].item;
124 /* why??? */
125 o->flags &= ~UNINTERESTING;
126 add_pending_object(&revs, o, NULL);
80ccaa78 127 }
1e39d7de
NTND
128 for (i = 0; i < have_obj.nr; i++) {
129 struct object *o = have_obj.objects[i].item;
130 o->flags |= UNINTERESTING;
131 add_pending_object(&revs, o, NULL);
132 }
133 setup_revisions(0, NULL, &revs, NULL);
3d51e1b5
MK
134 if (prepare_revision_walk(&revs))
135 die("revision walk setup failed");
80ccaa78 136 mark_edges_uninteresting(revs.commits, &revs, show_edge);
6523078b
NP
137 if (use_thin_pack)
138 for (i = 0; i < extra_edge_obj.nr; i++)
139 fprintf(pack_pipe, "-%s\n", sha1_to_hex(
140 extra_edge_obj.objects[i].item->sha1));
11c211fa 141 traverse_commit_list(&revs, show_commit, show_object, NULL);
618ebe9f
JS
142 fflush(pack_pipe);
143 fclose(pack_pipe);
21edd3f1 144 return 0;
80ccaa78
JS
145}
146
fb9040cc
LT
147static void create_pack_file(void)
148{
21edd3f1 149 struct async rev_list;
cc41fa8d 150 struct child_process pack_objects;
b1e9fff7 151 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
363b7817 152 char data[8193], progress[128];
583b7ea3
JH
153 char abort_msg[] = "aborting due to possible repository "
154 "corruption on the remote side.";
b1c71b72 155 int buffered = -1;
1456b043 156 ssize_t sz;
cc41fa8d
JS
157 const char *argv[10];
158 int arg = 0;
75bfc6c2 159
b9612197
JK
160 argv[arg++] = "pack-objects";
161 if (!shallow_nr) {
f0cea83f
NE
162 argv[arg++] = "--revs";
163 if (create_full_pack)
164 argv[arg++] = "--all";
165 else if (use_thin_pack)
166 argv[arg++] = "--thin";
167 }
75bfc6c2 168
cc41fa8d
JS
169 argv[arg++] = "--stdout";
170 if (!no_progress)
171 argv[arg++] = "--progress";
172 if (use_ofs_delta)
173 argv[arg++] = "--delta-base-offset";
348e390b
SP
174 if (use_include_tag)
175 argv[arg++] = "--include-tag";
cc41fa8d
JS
176 argv[arg++] = NULL;
177
178 memset(&pack_objects, 0, sizeof(pack_objects));
b9612197 179 pack_objects.in = -1;
cc41fa8d
JS
180 pack_objects.out = -1;
181 pack_objects.err = -1;
182 pack_objects.git_cmd = 1;
183 pack_objects.argv = argv;
21edd3f1 184
4c324c00 185 if (start_command(&pack_objects))
7e44c935 186 die("git upload-pack: unable to fork git-pack-objects");
b1c71b72 187
b9612197
JK
188 if (shallow_nr) {
189 memset(&rev_list, 0, sizeof(rev_list));
190 rev_list.proc = do_rev_list;
191 rev_list.out = pack_objects.in;
192 if (start_async(&rev_list))
193 die("git upload-pack: unable to fork git-rev-list");
194 }
195 else {
41698375 196 FILE *pipe_fd = xfdopen(pack_objects.in, "w");
f0cea83f
NE
197 if (!create_full_pack) {
198 int i;
199 for (i = 0; i < want_obj.nr; i++)
200 fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1));
201 fprintf(pipe_fd, "--not\n");
202 for (i = 0; i < have_obj.nr; i++)
203 fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1));
204 }
205
206 fprintf(pipe_fd, "\n");
207 fflush(pipe_fd);
208 fclose(pipe_fd);
209 }
210
211
cc41fa8d
JS
212 /* We read from pack_objects.err to capture stderr output for
213 * progress bar, and pack_objects.out to capture the pack data.
b1c71b72 214 */
b1c71b72
JH
215
216 while (1) {
b1c71b72 217 struct pollfd pfd[2];
363b7817 218 int pe, pu, pollsize;
b1c71b72 219
0d516ada
ML
220 reset_timeout();
221
b1c71b72 222 pollsize = 0;
363b7817 223 pe = pu = -1;
b1c71b72 224
cc41fa8d
JS
225 if (0 <= pack_objects.out) {
226 pfd[pollsize].fd = pack_objects.out;
b1c71b72
JH
227 pfd[pollsize].events = POLLIN;
228 pu = pollsize;
229 pollsize++;
230 }
cc41fa8d
JS
231 if (0 <= pack_objects.err) {
232 pfd[pollsize].fd = pack_objects.err;
363b7817
JH
233 pfd[pollsize].events = POLLIN;
234 pe = pollsize;
235 pollsize++;
236 }
b1c71b72 237
4c324c00
JS
238 if (!pollsize)
239 break;
240
241 if (poll(pfd, pollsize, -1) < 0) {
242 if (errno != EINTR) {
243 error("poll failed, resuming: %s",
244 strerror(errno));
245 sleep(1);
b1c71b72 246 }
4c324c00
JS
247 continue;
248 }
6b59f51b
NP
249 if (0 <= pe && (pfd[pe].revents & (POLLIN|POLLHUP))) {
250 /* Status ready; we ship that in the side-band
251 * or dump to the standard error.
252 */
253 sz = xread(pack_objects.err, progress,
254 sizeof(progress));
255 if (0 < sz)
256 send_client_data(2, progress, sz);
257 else if (sz == 0) {
258 close(pack_objects.err);
259 pack_objects.err = -1;
260 }
261 else
262 goto fail;
263 /* give priority to status messages */
264 continue;
265 }
4c324c00
JS
266 if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
267 /* Data ready; we keep the last byte to ourselves
268 * in case we detect broken rev-list, so that we
269 * can leave the stream corrupted. This is
270 * unfortunate -- unpack-objects would happily
271 * accept a valid packdata with trailing garbage,
272 * so appending garbage after we pass all the
273 * pack data is not good enough to signal
274 * breakage to downstream.
275 */
276 char *cp = data;
277 ssize_t outsz = 0;
278 if (0 <= buffered) {
279 *cp++ = buffered;
280 outsz++;
b1c71b72 281 }
4c324c00
JS
282 sz = xread(pack_objects.out, cp,
283 sizeof(data) - outsz);
284 if (0 < sz)
1456b043 285 ;
4c324c00
JS
286 else if (sz == 0) {
287 close(pack_objects.out);
288 pack_objects.out = -1;
363b7817 289 }
4c324c00
JS
290 else
291 goto fail;
292 sz += outsz;
293 if (1 < sz) {
294 buffered = data[sz-1] & 0xFF;
295 sz--;
b1c71b72 296 }
4c324c00
JS
297 else
298 buffered = -1;
299 sz = send_client_data(1, data, sz);
300 if (sz < 0)
b1c71b72 301 goto fail;
4c324c00 302 }
4c324c00 303 }
b1c71b72 304
4c324c00 305 if (finish_command(&pack_objects)) {
7e44c935 306 error("git upload-pack: git-pack-objects died with error.");
4c324c00
JS
307 goto fail;
308 }
f0cea83f 309 if (shallow_nr && finish_async(&rev_list))
4c324c00 310 goto fail; /* error was already reported */
b1c71b72 311
4c324c00
JS
312 /* flush the data */
313 if (0 <= buffered) {
314 data[0] = buffered;
315 sz = send_client_data(1, data, 1);
316 if (sz < 0)
317 goto fail;
318 fprintf(stderr, "flushed.\n");
b1c71b72 319 }
4c324c00
JS
320 if (use_sideband)
321 packet_flush(1);
322 return;
323
b1c71b72 324 fail:
583b7ea3 325 send_client_data(3, abort_msg, sizeof(abort_msg));
7e44c935 326 die("git upload-pack: %s", abort_msg);
fb9040cc
LT
327}
328
def88e9a
LT
329static int got_sha1(char *hex, unsigned char *sha1)
330{
b1e9fff7 331 struct object *o;
937a515a 332 int we_knew_they_have = 0;
b1e9fff7 333
def88e9a 334 if (get_sha1_hex(hex, sha1))
7e44c935 335 die("git upload-pack: expected SHA1 object, got '%s'", hex);
fb9040cc 336 if (!has_sha1_file(sha1))
937a515a 337 return -1;
b1e9fff7
JH
338
339 o = lookup_object(sha1);
340 if (!(o && o->parsed))
341 o = parse_object(sha1);
342 if (!o)
343 die("oops (%s)", sha1_to_hex(sha1));
182a8dab 344 if (o->type == OBJ_COMMIT) {
b1e9fff7 345 struct commit_list *parents;
937a515a 346 struct commit *commit = (struct commit *)o;
b1e9fff7 347 if (o->flags & THEY_HAVE)
937a515a
JH
348 we_knew_they_have = 1;
349 else
350 o->flags |= THEY_HAVE;
351 if (!oldest_have || (commit->date < oldest_have))
352 oldest_have = commit->date;
353 for (parents = commit->parents;
b1e9fff7
JH
354 parents;
355 parents = parents->next)
356 parents->item->object.flags |= THEY_HAVE;
fb9040cc 357 }
937a515a
JH
358 if (!we_knew_they_have) {
359 add_object_array(o, NULL, &have_obj);
360 return 1;
361 }
362 return 0;
363}
364
365static int reachable(struct commit *want)
366{
367 struct commit_list *work = NULL;
368
47e44ed1 369 commit_list_insert_by_date(want, &work);
937a515a
JH
370 while (work) {
371 struct commit_list *list = work->next;
372 struct commit *commit = work->item;
373 free(work);
374 work = list;
375
376 if (commit->object.flags & THEY_HAVE) {
377 want->object.flags |= COMMON_KNOWN;
378 break;
379 }
380 if (!commit->object.parsed)
381 parse_object(commit->object.sha1);
382 if (commit->object.flags & REACHABLE)
383 continue;
384 commit->object.flags |= REACHABLE;
385 if (commit->date < oldest_have)
386 continue;
387 for (list = commit->parents; list; list = list->next) {
388 struct commit *parent = list->item;
389 if (!(parent->object.flags & REACHABLE))
47e44ed1 390 commit_list_insert_by_date(parent, &work);
937a515a
JH
391 }
392 }
393 want->object.flags |= REACHABLE;
394 clear_commit_marks(want, REACHABLE);
395 free_commit_list(work);
396 return (want->object.flags & COMMON_KNOWN);
397}
398
399static int ok_to_give_up(void)
400{
401 int i;
402
403 if (!have_obj.nr)
404 return 0;
405
406 for (i = 0; i < want_obj.nr; i++) {
407 struct object *want = want_obj.objects[i].item;
408
409 if (want->flags & COMMON_KNOWN)
410 continue;
411 want = deref_tag(want, "a want line", 0);
412 if (!want || want->type != OBJ_COMMIT) {
413 /* no way to tell if this is reachable by
414 * looking at the ancestry chain alone, so
415 * leave a note to ourselves not to worry about
416 * this object anymore.
417 */
418 want_obj.objects[i].item->flags |= COMMON_KNOWN;
419 continue;
420 }
421 if (!reachable((struct commit *)want))
422 return 0;
423 }
fb9040cc 424 return 1;
def88e9a
LT
425}
426
427static int get_common_commits(void)
428{
429 static char line[1000];
c04c4e57 430 unsigned char sha1[20];
78affc49 431 char last_hex[41];
49bee717
SP
432 int got_common = 0;
433 int got_other = 0;
4e10cf9a 434 int sent_ready = 0;
def88e9a 435
f0243f26
JS
436 save_commit_buffer = 0;
437
eeefa7c9 438 for (;;) {
fd13b21f 439 int len = packet_read_line(0, line, sizeof(line));
960deccb 440 reset_timeout();
def88e9a
LT
441
442 if (!len) {
49bee717 443 if (multi_ack == 2 && got_common
4e10cf9a
JH
444 && !got_other && ok_to_give_up()) {
445 sent_ready = 1;
49bee717 446 packet_write(1, "ACK %s ready\n", last_hex);
4e10cf9a 447 }
b1e9fff7 448 if (have_obj.nr == 0 || multi_ack)
1bd8c8f0 449 packet_write(1, "NAK\n");
4e10cf9a
JH
450
451 if (no_done && sent_ready) {
452 packet_write(1, "ACK %s\n", last_hex);
453 return 0;
454 }
42526b47
SP
455 if (stateless_rpc)
456 exit(0);
49bee717
SP
457 got_common = 0;
458 got_other = 0;
def88e9a
LT
459 continue;
460 }
fd13b21f 461 strip(line, len);
cc44c765 462 if (!prefixcmp(line, "have ")) {
937a515a
JH
463 switch (got_sha1(line+5, sha1)) {
464 case -1: /* they have what we do not */
49bee717 465 got_other = 1;
78affc49
SP
466 if (multi_ack && ok_to_give_up()) {
467 const char *hex = sha1_to_hex(sha1);
4e10cf9a
JH
468 if (multi_ack == 2) {
469 sent_ready = 1;
78affc49 470 packet_write(1, "ACK %s ready\n", hex);
4e10cf9a 471 } else
78affc49
SP
472 packet_write(1, "ACK %s continue\n", hex);
473 }
937a515a
JH
474 break;
475 default:
49bee717 476 got_common = 1;
78affc49
SP
477 memcpy(last_hex, sha1_to_hex(sha1), 41);
478 if (multi_ack == 2)
479 packet_write(1, "ACK %s common\n", last_hex);
480 else if (multi_ack)
481 packet_write(1, "ACK %s continue\n", last_hex);
c04c4e57 482 else if (have_obj.nr == 1)
78affc49 483 packet_write(1, "ACK %s\n", last_hex);
937a515a 484 break;
af2d3aa4 485 }
def88e9a
LT
486 continue;
487 }
488 if (!strcmp(line, "done")) {
b1e9fff7 489 if (have_obj.nr > 0) {
1bd8c8f0 490 if (multi_ack)
c04c4e57 491 packet_write(1, "ACK %s\n", last_hex);
1bd8c8f0
JS
492 return 0;
493 }
def88e9a
LT
494 packet_write(1, "NAK\n");
495 return -1;
496 }
7e44c935 497 die("git upload-pack: expected SHA1 list, got '%s'", line);
def88e9a 498 }
def88e9a
LT
499}
500
b1e9fff7 501static void receive_needs(void)
fb9040cc 502{
3cd47459 503 struct object_array shallows = OBJECT_ARRAY_INIT;
fb9040cc 504 static char line[1000];
016e6ccb 505 int len, depth = 0;
fb9040cc 506
f0cea83f 507 shallow_nr = 0;
49aaddd1 508 if (debug_fd)
2b7ca830 509 write_str_in_full(debug_fd, "#S\n");
fb9040cc 510 for (;;) {
565ebbf7 511 struct object *o;
6ece0d30 512 unsigned char sha1_buf[20];
fb9040cc 513 len = packet_read_line(0, line, sizeof(line));
960deccb 514 reset_timeout();
fb9040cc 515 if (!len)
ed09aef0 516 break;
49aaddd1
SP
517 if (debug_fd)
518 write_in_full(debug_fd, line, len);
e091eb93 519
599065a3 520 if (!prefixcmp(line, "shallow ")) {
ed09aef0
JS
521 unsigned char sha1[20];
522 struct object *object;
523 if (get_sha1(line + 8, sha1))
524 die("invalid shallow line: %s", line);
525 object = parse_object(sha1);
526 if (!object)
527 die("did not find object for %s", line);
f53514bc 528 object->flags |= CLIENT_SHALLOW;
ed09aef0
JS
529 add_object_array(object, NULL, &shallows);
530 continue;
531 }
599065a3 532 if (!prefixcmp(line, "deepen ")) {
016e6ccb
JS
533 char *end;
534 depth = strtol(line + 7, &end, 0);
535 if (end == line + 7 || depth <= 0)
536 die("Invalid deepen: %s", line);
537 continue;
538 }
599065a3 539 if (prefixcmp(line, "want ") ||
6ece0d30 540 get_sha1_hex(line+5, sha1_buf))
7e44c935 541 die("git upload-pack: protocol error, "
e091eb93 542 "expected to get sha, not '%s'", line);
78affc49
SP
543 if (strstr(line+45, "multi_ack_detailed"))
544 multi_ack = 2;
545 else if (strstr(line+45, "multi_ack"))
1bd8c8f0 546 multi_ack = 1;
4e10cf9a
JH
547 if (strstr(line+45, "no-done"))
548 no_done = 1;
b19696c2
JH
549 if (strstr(line+45, "thin-pack"))
550 use_thin_pack = 1;
e4fe4b8e
NP
551 if (strstr(line+45, "ofs-delta"))
552 use_ofs_delta = 1;
d47f3db7
JH
553 if (strstr(line+45, "side-band-64k"))
554 use_sideband = LARGE_PACKET_MAX;
555 else if (strstr(line+45, "side-band"))
556 use_sideband = DEFAULT_PACKET_MAX;
b0e90897
JS
557 if (strstr(line+45, "no-progress"))
558 no_progress = 1;
348e390b
SP
559 if (strstr(line+45, "include-tag"))
560 use_include_tag = 1;
565ebbf7
JH
561
562 /* We have sent all our refs already, and the other end
563 * should have chosen out of them; otherwise they are
564 * asking for nonsense.
565 *
566 * Hmph. We may later want to allow "want" line that
567 * asks for something like "master~10" (symbolic)...
568 * would it make sense? I don't know.
569 */
570 o = lookup_object(sha1_buf);
571 if (!o || !(o->flags & OUR_REF))
9f9aa761
EN
572 die("git upload-pack: not our ref %s",
573 sha1_to_hex(sha1_buf));
565ebbf7
JH
574 if (!(o->flags & WANTED)) {
575 o->flags |= WANTED;
b1e9fff7 576 add_object_array(o, NULL, &want_obj);
565ebbf7 577 }
fb9040cc 578 }
49aaddd1 579 if (debug_fd)
2b7ca830 580 write_str_in_full(debug_fd, "#E\n");
9462e3f5
JS
581
582 if (!use_sideband && daemon_mode)
583 no_progress = 1;
584
f53514bc
JS
585 if (depth == 0 && shallows.nr == 0)
586 return;
016e6ccb
JS
587 if (depth > 0) {
588 struct commit_list *result, *backup;
f53514bc
JS
589 int i;
590 backup = result = get_shallow_commits(&want_obj, depth,
591 SHALLOW, NOT_SHALLOW);
016e6ccb 592 while (result) {
f53514bc 593 struct object *object = &result->item->object;
1f2de769 594 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
f53514bc
JS
595 packet_write(1, "shallow %s",
596 sha1_to_hex(object->sha1));
597 register_shallow(object->sha1);
f0cea83f 598 shallow_nr++;
f53514bc 599 }
016e6ccb
JS
600 result = result->next;
601 }
602 free_commit_list(backup);
f53514bc
JS
603 for (i = 0; i < shallows.nr; i++) {
604 struct object *object = shallows.objects[i].item;
605 if (object->flags & NOT_SHALLOW) {
606 struct commit_list *parents;
607 packet_write(1, "unshallow %s",
608 sha1_to_hex(object->sha1));
609 object->flags &= ~CLIENT_SHALLOW;
610 /* make sure the real parents are parsed */
611 unregister_shallow(object->sha1);
176d45cb 612 object->parsed = 0;
dec38c81
MK
613 if (parse_commit((struct commit *)object))
614 die("invalid commit");
f53514bc
JS
615 parents = ((struct commit *)object)->parents;
616 while (parents) {
617 add_object_array(&parents->item->object,
618 NULL, &want_obj);
619 parents = parents->next;
620 }
6523078b 621 add_object_array(object, NULL, &extra_edge_obj);
f53514bc
JS
622 }
623 /* make sure commit traversal conforms to client */
624 register_shallow(object->sha1);
625 }
626 packet_flush(1);
627 } else
628 if (shallows.nr > 0) {
629 int i;
630 for (i = 0; i < shallows.nr; i++)
631 register_shallow(shallows.objects[i].item->sha1);
632 }
f0cea83f
NE
633
634 shallow_nr += shallows.nr;
f53514bc 635 free(shallows.objects);
fb9040cc
LT
636}
637
8da19775 638static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
def88e9a 639{
ed09aef0 640 static const char *capabilities = "multi_ack thin-pack side-band"
348e390b 641 " side-band-64k ofs-delta shallow no-progress"
78affc49 642 " include-tag multi_ack_detailed";
f6b42a81
JH
643 struct object *o = parse_object(sha1);
644
b5b16990 645 if (!o)
7e44c935 646 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
b5b16990 647
1f5881bb 648 if (capabilities)
cf2ad8e6
JH
649 packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1), refname,
650 0, capabilities,
651 stateless_rpc ? " no-done" : "");
1f5881bb
JS
652 else
653 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
654 capabilities = NULL;
565ebbf7
JH
655 if (!(o->flags & OUR_REF)) {
656 o->flags |= OUR_REF;
657 nr_our_refs++;
658 }
1974632c 659 if (o->type == OBJ_TAG) {
9534f40b 660 o = deref_tag(o, refname, 0);
affeef12
MK
661 if (o)
662 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
f6b42a81 663 }
def88e9a
LT
664 return 0;
665}
666
42526b47
SP
667static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
668{
669 struct object *o = parse_object(sha1);
670 if (!o)
671 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
672 if (!(o->flags & OUR_REF)) {
673 o->flags |= OUR_REF;
674 nr_our_refs++;
675 }
676 return 0;
677}
678
59076eba 679static void upload_pack(void)
def88e9a 680{
42526b47
SP
681 if (advertise_refs || !stateless_rpc) {
682 reset_timeout();
683 head_ref(send_ref, NULL);
684 for_each_ref(send_ref, NULL);
685 packet_flush(1);
686 } else {
687 head_ref(mark_our_ref, NULL);
688 for_each_ref(mark_our_ref, NULL);
689 }
690 if (advertise_refs)
691 return;
692
b1e9fff7 693 receive_needs();
59076eba
DR
694 if (want_obj.nr) {
695 get_common_commits();
696 create_pack_file();
697 }
def88e9a
LT
698}
699
700int main(int argc, char **argv)
701{
8d630132 702 char *dir;
960deccb
PA
703 int i;
704 int strict = 0;
705
bbc30f99 706 packet_trace_identity("upload-pack");
2fb3f6db 707 git_extract_argv0_path(argv[0]);
dae556bd 708 read_replace_refs = 0;
2fb3f6db 709
960deccb
PA
710 for (i = 1; i < argc; i++) {
711 char *arg = argv[i];
712
713 if (arg[0] != '-')
714 break;
42526b47
SP
715 if (!strcmp(arg, "--advertise-refs")) {
716 advertise_refs = 1;
717 continue;
718 }
719 if (!strcmp(arg, "--stateless-rpc")) {
720 stateless_rpc = 1;
721 continue;
722 }
960deccb
PA
723 if (!strcmp(arg, "--strict")) {
724 strict = 1;
725 continue;
726 }
cc44c765 727 if (!prefixcmp(arg, "--timeout=")) {
960deccb 728 timeout = atoi(arg+10);
9462e3f5 729 daemon_mode = 1;
960deccb
PA
730 continue;
731 }
732 if (!strcmp(arg, "--")) {
733 i++;
734 break;
735 }
736 }
a6080a0a 737
960deccb 738 if (i != argc-1)
def88e9a 739 usage(upload_pack_usage);
04b33055 740
e1464ca7 741 setup_path();
04b33055 742
960deccb 743 dir = argv[i];
113b9475 744
8d630132 745 if (!enter_repo(dir, strict))
05ac6b34 746 die("'%s' does not appear to be a git repository", dir);
a0022eeb
JH
747 if (is_repository_shallow())
748 die("attempt to fetch/clone from a shallow repository");
49aaddd1
SP
749 if (getenv("GIT_DEBUG_SEND_PACK"))
750 debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
def88e9a
LT
751 upload_pack();
752 return 0;
753}