]> git.ipfire.org Git - thirdparty/git.git/blame - upload-pack.c
Revert "fetch-pack: Implement no-done capability"
[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;
348e390b 30static int use_thin_pack, use_ofs_delta, use_include_tag;
9462e3f5 31static int no_progress, daemon_mode;
f0cea83f 32static int shallow_nr;
b1e9fff7
JH
33static struct object_array have_obj;
34static struct object_array want_obj;
6523078b 35static struct object_array extra_edge_obj;
96f1e58f 36static unsigned int timeout;
d47f3db7
JH
37/* 0 for no sideband,
38 * otherwise maximum packet size (up to 65520 bytes).
39 */
96f1e58f 40static int use_sideband;
49aaddd1 41static int debug_fd;
42526b47
SP
42static int advertise_refs;
43static int stateless_rpc;
960deccb
PA
44
45static void reset_timeout(void)
46{
47 alarm(timeout);
48}
fb9040cc 49
75bfc6c2
LT
50static int strip(char *line, int len)
51{
52 if (len && line[len-1] == '\n')
53 line[--len] = 0;
54 return len;
55}
56
583b7ea3
JH
57static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
58{
958c24b1 59 if (use_sideband)
d47f3db7 60 return send_sideband(1, fd, data, sz, use_sideband);
958c24b1
JH
61 if (fd == 3)
62 /* emergency quit */
63 fd = 2;
64 if (fd == 2) {
93822c22 65 /* XXX: are we happy to lose stuff here? */
958c24b1
JH
66 xwrite(fd, data, sz);
67 return sz;
583b7ea3 68 }
958c24b1 69 return safe_write(fd, data, sz);
583b7ea3
JH
70}
71
16befb8b 72static FILE *pack_pipe = NULL;
11c211fa 73static void show_commit(struct commit *commit, void *data)
9b8dc263
JS
74{
75 if (commit->object.flags & BOUNDARY)
76 fputc('-', pack_pipe);
77 if (fputs(sha1_to_hex(commit->object.sha1), pack_pipe) < 0)
78 die("broken output pipe");
79 fputc('\n', pack_pipe);
80 fflush(pack_pipe);
81 free(commit->buffer);
82 commit->buffer = NULL;
83}
84
cf2ab916 85static void show_object(struct object *obj, const struct name_path *path, const char *component)
9b8dc263
JS
86{
87 /* An object with name "foo\n0000000..." can be used to
88 * confuse downstream git-pack-objects very badly.
89 */
cf2ab916 90 const char *name = path_name(path, component);
8d2dfc49 91 const char *ep = strchr(name, '\n');
9b8dc263 92 if (ep) {
8d2dfc49
LT
93 fprintf(pack_pipe, "%s %.*s\n", sha1_to_hex(obj->sha1),
94 (int) (ep - name),
95 name);
9b8dc263
JS
96 }
97 else
98 fprintf(pack_pipe, "%s %s\n",
8d2dfc49 99 sha1_to_hex(obj->sha1), name);
cf2ab916 100 free((char *)name);
9b8dc263
JS
101}
102
103static void show_edge(struct commit *commit)
104{
105 fprintf(pack_pipe, "-%s\n", sha1_to_hex(commit->object.sha1));
106}
107
1e39d7de 108static int do_rev_list(int in, int out, void *user_data)
80ccaa78
JS
109{
110 int i;
111 struct rev_info revs;
112
ae6a5609 113 pack_pipe = xfdopen(out, "w");
80ccaa78
JS
114 init_revisions(&revs, NULL);
115 revs.tag_objects = 1;
116 revs.tree_objects = 1;
117 revs.blob_objects = 1;
118 if (use_thin_pack)
119 revs.edge_hint = 1;
120
1e39d7de
NTND
121 for (i = 0; i < want_obj.nr; i++) {
122 struct object *o = want_obj.objects[i].item;
123 /* why??? */
124 o->flags &= ~UNINTERESTING;
125 add_pending_object(&revs, o, NULL);
80ccaa78 126 }
1e39d7de
NTND
127 for (i = 0; i < have_obj.nr; i++) {
128 struct object *o = have_obj.objects[i].item;
129 o->flags |= UNINTERESTING;
130 add_pending_object(&revs, o, NULL);
131 }
132 setup_revisions(0, NULL, &revs, NULL);
3d51e1b5
MK
133 if (prepare_revision_walk(&revs))
134 die("revision walk setup failed");
80ccaa78 135 mark_edges_uninteresting(revs.commits, &revs, show_edge);
6523078b
NP
136 if (use_thin_pack)
137 for (i = 0; i < extra_edge_obj.nr; i++)
138 fprintf(pack_pipe, "-%s\n", sha1_to_hex(
139 extra_edge_obj.objects[i].item->sha1));
11c211fa 140 traverse_commit_list(&revs, show_commit, show_object, NULL);
618ebe9f
JS
141 fflush(pack_pipe);
142 fclose(pack_pipe);
21edd3f1 143 return 0;
80ccaa78
JS
144}
145
fb9040cc
LT
146static void create_pack_file(void)
147{
21edd3f1 148 struct async rev_list;
cc41fa8d 149 struct child_process pack_objects;
b1e9fff7 150 int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr);
363b7817 151 char data[8193], progress[128];
583b7ea3
JH
152 char abort_msg[] = "aborting due to possible repository "
153 "corruption on the remote side.";
b1c71b72 154 int buffered = -1;
1456b043 155 ssize_t sz;
cc41fa8d
JS
156 const char *argv[10];
157 int arg = 0;
75bfc6c2 158
f0cea83f 159 if (shallow_nr) {
ae6a5609 160 memset(&rev_list, 0, sizeof(rev_list));
f0cea83f 161 rev_list.proc = do_rev_list;
ae6a5609 162 rev_list.out = -1;
f0cea83f
NE
163 if (start_async(&rev_list))
164 die("git upload-pack: unable to fork git-rev-list");
165 argv[arg++] = "pack-objects";
166 } else {
167 argv[arg++] = "pack-objects";
168 argv[arg++] = "--revs";
169 if (create_full_pack)
170 argv[arg++] = "--all";
171 else if (use_thin_pack)
172 argv[arg++] = "--thin";
173 }
75bfc6c2 174
cc41fa8d
JS
175 argv[arg++] = "--stdout";
176 if (!no_progress)
177 argv[arg++] = "--progress";
178 if (use_ofs_delta)
179 argv[arg++] = "--delta-base-offset";
348e390b
SP
180 if (use_include_tag)
181 argv[arg++] = "--include-tag";
cc41fa8d
JS
182 argv[arg++] = NULL;
183
184 memset(&pack_objects, 0, sizeof(pack_objects));
f0cea83f 185 pack_objects.in = shallow_nr ? rev_list.out : -1;
cc41fa8d
JS
186 pack_objects.out = -1;
187 pack_objects.err = -1;
188 pack_objects.git_cmd = 1;
189 pack_objects.argv = argv;
21edd3f1 190
4c324c00 191 if (start_command(&pack_objects))
7e44c935 192 die("git upload-pack: unable to fork git-pack-objects");
b1c71b72 193
f0cea83f
NE
194 /* pass on revisions we (don't) want */
195 if (!shallow_nr) {
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;
def88e9a 434
f0243f26
JS
435 save_commit_buffer = 0;
436
eeefa7c9 437 for (;;) {
fd13b21f 438 int len = packet_read_line(0, line, sizeof(line));
960deccb 439 reset_timeout();
def88e9a
LT
440
441 if (!len) {
49bee717 442 if (multi_ack == 2 && got_common
4793b7e8 443 && !got_other && ok_to_give_up())
49bee717 444 packet_write(1, "ACK %s ready\n", last_hex);
b1e9fff7 445 if (have_obj.nr == 0 || multi_ack)
1bd8c8f0 446 packet_write(1, "NAK\n");
42526b47
SP
447 if (stateless_rpc)
448 exit(0);
49bee717
SP
449 got_common = 0;
450 got_other = 0;
def88e9a
LT
451 continue;
452 }
fd13b21f 453 strip(line, len);
cc44c765 454 if (!prefixcmp(line, "have ")) {
937a515a
JH
455 switch (got_sha1(line+5, sha1)) {
456 case -1: /* they have what we do not */
49bee717 457 got_other = 1;
78affc49
SP
458 if (multi_ack && ok_to_give_up()) {
459 const char *hex = sha1_to_hex(sha1);
4793b7e8 460 if (multi_ack == 2)
78affc49 461 packet_write(1, "ACK %s ready\n", hex);
4793b7e8 462 else
78affc49
SP
463 packet_write(1, "ACK %s continue\n", hex);
464 }
937a515a
JH
465 break;
466 default:
49bee717 467 got_common = 1;
78affc49
SP
468 memcpy(last_hex, sha1_to_hex(sha1), 41);
469 if (multi_ack == 2)
470 packet_write(1, "ACK %s common\n", last_hex);
471 else if (multi_ack)
472 packet_write(1, "ACK %s continue\n", last_hex);
c04c4e57 473 else if (have_obj.nr == 1)
78affc49 474 packet_write(1, "ACK %s\n", last_hex);
937a515a 475 break;
af2d3aa4 476 }
def88e9a
LT
477 continue;
478 }
479 if (!strcmp(line, "done")) {
b1e9fff7 480 if (have_obj.nr > 0) {
1bd8c8f0 481 if (multi_ack)
c04c4e57 482 packet_write(1, "ACK %s\n", last_hex);
1bd8c8f0
JS
483 return 0;
484 }
def88e9a
LT
485 packet_write(1, "NAK\n");
486 return -1;
487 }
7e44c935 488 die("git upload-pack: expected SHA1 list, got '%s'", line);
def88e9a 489 }
def88e9a
LT
490}
491
b1e9fff7 492static void receive_needs(void)
fb9040cc 493{
3cd47459 494 struct object_array shallows = OBJECT_ARRAY_INIT;
fb9040cc 495 static char line[1000];
016e6ccb 496 int len, depth = 0;
fb9040cc 497
f0cea83f 498 shallow_nr = 0;
49aaddd1 499 if (debug_fd)
2b7ca830 500 write_str_in_full(debug_fd, "#S\n");
fb9040cc 501 for (;;) {
565ebbf7 502 struct object *o;
6ece0d30 503 unsigned char sha1_buf[20];
fb9040cc 504 len = packet_read_line(0, line, sizeof(line));
960deccb 505 reset_timeout();
fb9040cc 506 if (!len)
ed09aef0 507 break;
49aaddd1
SP
508 if (debug_fd)
509 write_in_full(debug_fd, line, len);
e091eb93 510
599065a3 511 if (!prefixcmp(line, "shallow ")) {
ed09aef0
JS
512 unsigned char sha1[20];
513 struct object *object;
514 if (get_sha1(line + 8, sha1))
515 die("invalid shallow line: %s", line);
516 object = parse_object(sha1);
517 if (!object)
518 die("did not find object for %s", line);
f53514bc 519 object->flags |= CLIENT_SHALLOW;
ed09aef0
JS
520 add_object_array(object, NULL, &shallows);
521 continue;
522 }
599065a3 523 if (!prefixcmp(line, "deepen ")) {
016e6ccb
JS
524 char *end;
525 depth = strtol(line + 7, &end, 0);
526 if (end == line + 7 || depth <= 0)
527 die("Invalid deepen: %s", line);
528 continue;
529 }
599065a3 530 if (prefixcmp(line, "want ") ||
6ece0d30 531 get_sha1_hex(line+5, sha1_buf))
7e44c935 532 die("git upload-pack: protocol error, "
e091eb93 533 "expected to get sha, not '%s'", line);
78affc49
SP
534 if (strstr(line+45, "multi_ack_detailed"))
535 multi_ack = 2;
536 else if (strstr(line+45, "multi_ack"))
1bd8c8f0 537 multi_ack = 1;
b19696c2
JH
538 if (strstr(line+45, "thin-pack"))
539 use_thin_pack = 1;
e4fe4b8e
NP
540 if (strstr(line+45, "ofs-delta"))
541 use_ofs_delta = 1;
d47f3db7
JH
542 if (strstr(line+45, "side-band-64k"))
543 use_sideband = LARGE_PACKET_MAX;
544 else if (strstr(line+45, "side-band"))
545 use_sideband = DEFAULT_PACKET_MAX;
b0e90897
JS
546 if (strstr(line+45, "no-progress"))
547 no_progress = 1;
348e390b
SP
548 if (strstr(line+45, "include-tag"))
549 use_include_tag = 1;
565ebbf7
JH
550
551 /* We have sent all our refs already, and the other end
552 * should have chosen out of them; otherwise they are
553 * asking for nonsense.
554 *
555 * Hmph. We may later want to allow "want" line that
556 * asks for something like "master~10" (symbolic)...
557 * would it make sense? I don't know.
558 */
559 o = lookup_object(sha1_buf);
560 if (!o || !(o->flags & OUR_REF))
9f9aa761
EN
561 die("git upload-pack: not our ref %s",
562 sha1_to_hex(sha1_buf));
565ebbf7
JH
563 if (!(o->flags & WANTED)) {
564 o->flags |= WANTED;
b1e9fff7 565 add_object_array(o, NULL, &want_obj);
565ebbf7 566 }
fb9040cc 567 }
49aaddd1 568 if (debug_fd)
2b7ca830 569 write_str_in_full(debug_fd, "#E\n");
9462e3f5
JS
570
571 if (!use_sideband && daemon_mode)
572 no_progress = 1;
573
f53514bc
JS
574 if (depth == 0 && shallows.nr == 0)
575 return;
016e6ccb
JS
576 if (depth > 0) {
577 struct commit_list *result, *backup;
f53514bc
JS
578 int i;
579 backup = result = get_shallow_commits(&want_obj, depth,
580 SHALLOW, NOT_SHALLOW);
016e6ccb 581 while (result) {
f53514bc 582 struct object *object = &result->item->object;
1f2de769 583 if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
f53514bc
JS
584 packet_write(1, "shallow %s",
585 sha1_to_hex(object->sha1));
586 register_shallow(object->sha1);
f0cea83f 587 shallow_nr++;
f53514bc 588 }
016e6ccb
JS
589 result = result->next;
590 }
591 free_commit_list(backup);
f53514bc
JS
592 for (i = 0; i < shallows.nr; i++) {
593 struct object *object = shallows.objects[i].item;
594 if (object->flags & NOT_SHALLOW) {
595 struct commit_list *parents;
596 packet_write(1, "unshallow %s",
597 sha1_to_hex(object->sha1));
598 object->flags &= ~CLIENT_SHALLOW;
599 /* make sure the real parents are parsed */
600 unregister_shallow(object->sha1);
176d45cb 601 object->parsed = 0;
dec38c81
MK
602 if (parse_commit((struct commit *)object))
603 die("invalid commit");
f53514bc
JS
604 parents = ((struct commit *)object)->parents;
605 while (parents) {
606 add_object_array(&parents->item->object,
607 NULL, &want_obj);
608 parents = parents->next;
609 }
6523078b 610 add_object_array(object, NULL, &extra_edge_obj);
f53514bc
JS
611 }
612 /* make sure commit traversal conforms to client */
613 register_shallow(object->sha1);
614 }
615 packet_flush(1);
616 } else
617 if (shallows.nr > 0) {
618 int i;
619 for (i = 0; i < shallows.nr; i++)
620 register_shallow(shallows.objects[i].item->sha1);
621 }
f0cea83f
NE
622
623 shallow_nr += shallows.nr;
f53514bc 624 free(shallows.objects);
fb9040cc
LT
625}
626
8da19775 627static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
def88e9a 628{
ed09aef0 629 static const char *capabilities = "multi_ack thin-pack side-band"
348e390b 630 " side-band-64k ofs-delta shallow no-progress"
4793b7e8 631 " include-tag multi_ack_detailed";
f6b42a81
JH
632 struct object *o = parse_object(sha1);
633
b5b16990 634 if (!o)
7e44c935 635 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
b5b16990 636
1f5881bb
JS
637 if (capabilities)
638 packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
639 0, capabilities);
640 else
641 packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
642 capabilities = NULL;
565ebbf7
JH
643 if (!(o->flags & OUR_REF)) {
644 o->flags |= OUR_REF;
645 nr_our_refs++;
646 }
1974632c 647 if (o->type == OBJ_TAG) {
9534f40b 648 o = deref_tag(o, refname, 0);
affeef12
MK
649 if (o)
650 packet_write(1, "%s %s^{}\n", sha1_to_hex(o->sha1), refname);
f6b42a81 651 }
def88e9a
LT
652 return 0;
653}
654
42526b47
SP
655static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
656{
657 struct object *o = parse_object(sha1);
658 if (!o)
659 die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
660 if (!(o->flags & OUR_REF)) {
661 o->flags |= OUR_REF;
662 nr_our_refs++;
663 }
664 return 0;
665}
666
59076eba 667static void upload_pack(void)
def88e9a 668{
42526b47
SP
669 if (advertise_refs || !stateless_rpc) {
670 reset_timeout();
671 head_ref(send_ref, NULL);
672 for_each_ref(send_ref, NULL);
673 packet_flush(1);
674 } else {
675 head_ref(mark_our_ref, NULL);
676 for_each_ref(mark_our_ref, NULL);
677 }
678 if (advertise_refs)
679 return;
680
b1e9fff7 681 receive_needs();
59076eba
DR
682 if (want_obj.nr) {
683 get_common_commits();
684 create_pack_file();
685 }
def88e9a
LT
686}
687
688int main(int argc, char **argv)
689{
8d630132 690 char *dir;
960deccb
PA
691 int i;
692 int strict = 0;
693
bbc30f99 694 packet_trace_identity("upload-pack");
2fb3f6db 695 git_extract_argv0_path(argv[0]);
dae556bd 696 read_replace_refs = 0;
2fb3f6db 697
960deccb
PA
698 for (i = 1; i < argc; i++) {
699 char *arg = argv[i];
700
701 if (arg[0] != '-')
702 break;
42526b47
SP
703 if (!strcmp(arg, "--advertise-refs")) {
704 advertise_refs = 1;
705 continue;
706 }
707 if (!strcmp(arg, "--stateless-rpc")) {
708 stateless_rpc = 1;
709 continue;
710 }
960deccb
PA
711 if (!strcmp(arg, "--strict")) {
712 strict = 1;
713 continue;
714 }
cc44c765 715 if (!prefixcmp(arg, "--timeout=")) {
960deccb 716 timeout = atoi(arg+10);
9462e3f5 717 daemon_mode = 1;
960deccb
PA
718 continue;
719 }
720 if (!strcmp(arg, "--")) {
721 i++;
722 break;
723 }
724 }
a6080a0a 725
960deccb 726 if (i != argc-1)
def88e9a 727 usage(upload_pack_usage);
04b33055 728
e1464ca7 729 setup_path();
04b33055 730
960deccb 731 dir = argv[i];
113b9475 732
8d630132 733 if (!enter_repo(dir, strict))
05ac6b34 734 die("'%s' does not appear to be a git repository", dir);
a0022eeb
JH
735 if (is_repository_shallow())
736 die("attempt to fetch/clone from a shallow repository");
49aaddd1
SP
737 if (getenv("GIT_DEBUG_SEND_PACK"))
738 debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK"));
def88e9a
LT
739 upload_pack();
740 return 0;
741}