sha1_file: fix iterating loose alternate objects
[git] / builtin / pack-objects.c
1 #include "builtin.h"
2 #include "cache.h"
3 #include "attr.h"
4 #include "object.h"
5 #include "blob.h"
6 #include "commit.h"
7 #include "tag.h"
8 #include "tree.h"
9 #include "delta.h"
10 #include "pack.h"
11 #include "pack-revindex.h"
12 #include "csum-file.h"
13 #include "tree-walk.h"
14 #include "diff.h"
15 #include "revision.h"
16 #include "list-objects.h"
17 #include "pack-objects.h"
18 #include "progress.h"
19 #include "refs.h"
20 #include "streaming.h"
21 #include "thread-utils.h"
22 #include "pack-bitmap.h"
23 #include "reachable.h"
24 #include "sha1-array.h"
25 #include "argv-array.h"
26
27 static const char *pack_usage[] = {
28         N_("git pack-objects --stdout [options...] [< ref-list | < object-list]"),
29         N_("git pack-objects [options...] base-name [< ref-list | < object-list]"),
30         NULL
31 };
32
33 /*
34  * Objects we are going to pack are collected in the `to_pack` structure.
35  * It contains an array (dynamically expanded) of the object data, and a map
36  * that can resolve SHA1s to their position in the array.
37  */
38 static struct packing_data to_pack;
39
40 static struct pack_idx_entry **written_list;
41 static uint32_t nr_result, nr_written;
42
43 static int non_empty;
44 static int reuse_delta = 1, reuse_object = 1;
45 static int keep_unreachable, unpack_unreachable, include_tag;
46 static unsigned long unpack_unreachable_expiration;
47 static int local;
48 static int incremental;
49 static int ignore_packed_keep;
50 static int allow_ofs_delta;
51 static struct pack_idx_option pack_idx_opts;
52 static const char *base_name;
53 static int progress = 1;
54 static int window = 10;
55 static unsigned long pack_size_limit;
56 static int depth = 50;
57 static int delta_search_threads;
58 static int pack_to_stdout;
59 static int num_preferred_base;
60 static struct progress *progress_state;
61 static int pack_compression_level = Z_DEFAULT_COMPRESSION;
62 static int pack_compression_seen;
63
64 static struct packed_git *reuse_packfile;
65 static uint32_t reuse_packfile_objects;
66 static off_t reuse_packfile_offset;
67
68 static int use_bitmap_index = 1;
69 static int write_bitmap_index;
70 static uint16_t write_bitmap_options;
71
72 static unsigned long delta_cache_size = 0;
73 static unsigned long max_delta_cache_size = 256 * 1024 * 1024;
74 static unsigned long cache_max_small_delta_size = 1000;
75
76 static unsigned long window_memory_limit = 0;
77
78 /*
79  * stats
80  */
81 static uint32_t written, written_delta;
82 static uint32_t reused, reused_delta;
83
84 /*
85  * Indexed commits
86  */
87 static struct commit **indexed_commits;
88 static unsigned int indexed_commits_nr;
89 static unsigned int indexed_commits_alloc;
90
91 static void index_commit_for_bitmap(struct commit *commit)
92 {
93         if (indexed_commits_nr >= indexed_commits_alloc) {
94                 indexed_commits_alloc = (indexed_commits_alloc + 32) * 2;
95                 REALLOC_ARRAY(indexed_commits, indexed_commits_alloc);
96         }
97
98         indexed_commits[indexed_commits_nr++] = commit;
99 }
100
101 static void *get_delta(struct object_entry *entry)
102 {
103         unsigned long size, base_size, delta_size;
104         void *buf, *base_buf, *delta_buf;
105         enum object_type type;
106
107         buf = read_sha1_file(entry->idx.sha1, &type, &size);
108         if (!buf)
109                 die("unable to read %s", sha1_to_hex(entry->idx.sha1));
110         base_buf = read_sha1_file(entry->delta->idx.sha1, &type, &base_size);
111         if (!base_buf)
112                 die("unable to read %s", sha1_to_hex(entry->delta->idx.sha1));
113         delta_buf = diff_delta(base_buf, base_size,
114                                buf, size, &delta_size, 0);
115         if (!delta_buf || delta_size != entry->delta_size)
116                 die("delta size changed");
117         free(buf);
118         free(base_buf);
119         return delta_buf;
120 }
121
122 static unsigned long do_compress(void **pptr, unsigned long size)
123 {
124         git_zstream stream;
125         void *in, *out;
126         unsigned long maxsize;
127
128         memset(&stream, 0, sizeof(stream));
129         git_deflate_init(&stream, pack_compression_level);
130         maxsize = git_deflate_bound(&stream, size);
131
132         in = *pptr;
133         out = xmalloc(maxsize);
134         *pptr = out;
135
136         stream.next_in = in;
137         stream.avail_in = size;
138         stream.next_out = out;
139         stream.avail_out = maxsize;
140         while (git_deflate(&stream, Z_FINISH) == Z_OK)
141                 ; /* nothing */
142         git_deflate_end(&stream);
143
144         free(in);
145         return stream.total_out;
146 }
147
148 static unsigned long write_large_blob_data(struct git_istream *st, struct sha1file *f,
149                                            const unsigned char *sha1)
150 {
151         git_zstream stream;
152         unsigned char ibuf[1024 * 16];
153         unsigned char obuf[1024 * 16];
154         unsigned long olen = 0;
155
156         memset(&stream, 0, sizeof(stream));
157         git_deflate_init(&stream, pack_compression_level);
158
159         for (;;) {
160                 ssize_t readlen;
161                 int zret = Z_OK;
162                 readlen = read_istream(st, ibuf, sizeof(ibuf));
163                 if (readlen == -1)
164                         die(_("unable to read %s"), sha1_to_hex(sha1));
165
166                 stream.next_in = ibuf;
167                 stream.avail_in = readlen;
168                 while ((stream.avail_in || readlen == 0) &&
169                        (zret == Z_OK || zret == Z_BUF_ERROR)) {
170                         stream.next_out = obuf;
171                         stream.avail_out = sizeof(obuf);
172                         zret = git_deflate(&stream, readlen ? 0 : Z_FINISH);
173                         sha1write(f, obuf, stream.next_out - obuf);
174                         olen += stream.next_out - obuf;
175                 }
176                 if (stream.avail_in)
177                         die(_("deflate error (%d)"), zret);
178                 if (readlen == 0) {
179                         if (zret != Z_STREAM_END)
180                                 die(_("deflate error (%d)"), zret);
181                         break;
182                 }
183         }
184         git_deflate_end(&stream);
185         return olen;
186 }
187
188 /*
189  * we are going to reuse the existing object data as is.  make
190  * sure it is not corrupt.
191  */
192 static int check_pack_inflate(struct packed_git *p,
193                 struct pack_window **w_curs,
194                 off_t offset,
195                 off_t len,
196                 unsigned long expect)
197 {
198         git_zstream stream;
199         unsigned char fakebuf[4096], *in;
200         int st;
201
202         memset(&stream, 0, sizeof(stream));
203         git_inflate_init(&stream);
204         do {
205                 in = use_pack(p, w_curs, offset, &stream.avail_in);
206                 stream.next_in = in;
207                 stream.next_out = fakebuf;
208                 stream.avail_out = sizeof(fakebuf);
209                 st = git_inflate(&stream, Z_FINISH);
210                 offset += stream.next_in - in;
211         } while (st == Z_OK || st == Z_BUF_ERROR);
212         git_inflate_end(&stream);
213         return (st == Z_STREAM_END &&
214                 stream.total_out == expect &&
215                 stream.total_in == len) ? 0 : -1;
216 }
217
218 static void copy_pack_data(struct sha1file *f,
219                 struct packed_git *p,
220                 struct pack_window **w_curs,
221                 off_t offset,
222                 off_t len)
223 {
224         unsigned char *in;
225         unsigned long avail;
226
227         while (len) {
228                 in = use_pack(p, w_curs, offset, &avail);
229                 if (avail > len)
230                         avail = (unsigned long)len;
231                 sha1write(f, in, avail);
232                 offset += avail;
233                 len -= avail;
234         }
235 }
236
237 /* Return 0 if we will bust the pack-size limit */
238 static unsigned long write_no_reuse_object(struct sha1file *f, struct object_entry *entry,
239                                            unsigned long limit, int usable_delta)
240 {
241         unsigned long size, datalen;
242         unsigned char header[10], dheader[10];
243         unsigned hdrlen;
244         enum object_type type;
245         void *buf;
246         struct git_istream *st = NULL;
247
248         if (!usable_delta) {
249                 if (entry->type == OBJ_BLOB &&
250                     entry->size > big_file_threshold &&
251                     (st = open_istream(entry->idx.sha1, &type, &size, NULL)) != NULL)
252                         buf = NULL;
253                 else {
254                         buf = read_sha1_file(entry->idx.sha1, &type, &size);
255                         if (!buf)
256                                 die(_("unable to read %s"), sha1_to_hex(entry->idx.sha1));
257                 }
258                 /*
259                  * make sure no cached delta data remains from a
260                  * previous attempt before a pack split occurred.
261                  */
262                 free(entry->delta_data);
263                 entry->delta_data = NULL;
264                 entry->z_delta_size = 0;
265         } else if (entry->delta_data) {
266                 size = entry->delta_size;
267                 buf = entry->delta_data;
268                 entry->delta_data = NULL;
269                 type = (allow_ofs_delta && entry->delta->idx.offset) ?
270                         OBJ_OFS_DELTA : OBJ_REF_DELTA;
271         } else {
272                 buf = get_delta(entry);
273                 size = entry->delta_size;
274                 type = (allow_ofs_delta && entry->delta->idx.offset) ?
275                         OBJ_OFS_DELTA : OBJ_REF_DELTA;
276         }
277
278         if (st) /* large blob case, just assume we don't compress well */
279                 datalen = size;
280         else if (entry->z_delta_size)
281                 datalen = entry->z_delta_size;
282         else
283                 datalen = do_compress(&buf, size);
284
285         /*
286          * The object header is a byte of 'type' followed by zero or
287          * more bytes of length.
288          */
289         hdrlen = encode_in_pack_object_header(type, size, header);
290
291         if (type == OBJ_OFS_DELTA) {
292                 /*
293                  * Deltas with relative base contain an additional
294                  * encoding of the relative offset for the delta
295                  * base from this object's position in the pack.
296                  */
297                 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
298                 unsigned pos = sizeof(dheader) - 1;
299                 dheader[pos] = ofs & 127;
300                 while (ofs >>= 7)
301                         dheader[--pos] = 128 | (--ofs & 127);
302                 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
303                         if (st)
304                                 close_istream(st);
305                         free(buf);
306                         return 0;
307                 }
308                 sha1write(f, header, hdrlen);
309                 sha1write(f, dheader + pos, sizeof(dheader) - pos);
310                 hdrlen += sizeof(dheader) - pos;
311         } else if (type == OBJ_REF_DELTA) {
312                 /*
313                  * Deltas with a base reference contain
314                  * an additional 20 bytes for the base sha1.
315                  */
316                 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
317                         if (st)
318                                 close_istream(st);
319                         free(buf);
320                         return 0;
321                 }
322                 sha1write(f, header, hdrlen);
323                 sha1write(f, entry->delta->idx.sha1, 20);
324                 hdrlen += 20;
325         } else {
326                 if (limit && hdrlen + datalen + 20 >= limit) {
327                         if (st)
328                                 close_istream(st);
329                         free(buf);
330                         return 0;
331                 }
332                 sha1write(f, header, hdrlen);
333         }
334         if (st) {
335                 datalen = write_large_blob_data(st, f, entry->idx.sha1);
336                 close_istream(st);
337         } else {
338                 sha1write(f, buf, datalen);
339                 free(buf);
340         }
341
342         return hdrlen + datalen;
343 }
344
345 /* Return 0 if we will bust the pack-size limit */
346 static unsigned long write_reuse_object(struct sha1file *f, struct object_entry *entry,
347                                         unsigned long limit, int usable_delta)
348 {
349         struct packed_git *p = entry->in_pack;
350         struct pack_window *w_curs = NULL;
351         struct revindex_entry *revidx;
352         off_t offset;
353         enum object_type type = entry->type;
354         unsigned long datalen;
355         unsigned char header[10], dheader[10];
356         unsigned hdrlen;
357
358         if (entry->delta)
359                 type = (allow_ofs_delta && entry->delta->idx.offset) ?
360                         OBJ_OFS_DELTA : OBJ_REF_DELTA;
361         hdrlen = encode_in_pack_object_header(type, entry->size, header);
362
363         offset = entry->in_pack_offset;
364         revidx = find_pack_revindex(p, offset);
365         datalen = revidx[1].offset - offset;
366         if (!pack_to_stdout && p->index_version > 1 &&
367             check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
368                 error("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1));
369                 unuse_pack(&w_curs);
370                 return write_no_reuse_object(f, entry, limit, usable_delta);
371         }
372
373         offset += entry->in_pack_header_size;
374         datalen -= entry->in_pack_header_size;
375
376         if (!pack_to_stdout && p->index_version == 1 &&
377             check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) {
378                 error("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1));
379                 unuse_pack(&w_curs);
380                 return write_no_reuse_object(f, entry, limit, usable_delta);
381         }
382
383         if (type == OBJ_OFS_DELTA) {
384                 off_t ofs = entry->idx.offset - entry->delta->idx.offset;
385                 unsigned pos = sizeof(dheader) - 1;
386                 dheader[pos] = ofs & 127;
387                 while (ofs >>= 7)
388                         dheader[--pos] = 128 | (--ofs & 127);
389                 if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) {
390                         unuse_pack(&w_curs);
391                         return 0;
392                 }
393                 sha1write(f, header, hdrlen);
394                 sha1write(f, dheader + pos, sizeof(dheader) - pos);
395                 hdrlen += sizeof(dheader) - pos;
396                 reused_delta++;
397         } else if (type == OBJ_REF_DELTA) {
398                 if (limit && hdrlen + 20 + datalen + 20 >= limit) {
399                         unuse_pack(&w_curs);
400                         return 0;
401                 }
402                 sha1write(f, header, hdrlen);
403                 sha1write(f, entry->delta->idx.sha1, 20);
404                 hdrlen += 20;
405                 reused_delta++;
406         } else {
407                 if (limit && hdrlen + datalen + 20 >= limit) {
408                         unuse_pack(&w_curs);
409                         return 0;
410                 }
411                 sha1write(f, header, hdrlen);
412         }
413         copy_pack_data(f, p, &w_curs, offset, datalen);
414         unuse_pack(&w_curs);
415         reused++;
416         return hdrlen + datalen;
417 }
418
419 /* Return 0 if we will bust the pack-size limit */
420 static unsigned long write_object(struct sha1file *f,
421                                   struct object_entry *entry,
422                                   off_t write_offset)
423 {
424         unsigned long limit, len;
425         int usable_delta, to_reuse;
426
427         if (!pack_to_stdout)
428                 crc32_begin(f);
429
430         /* apply size limit if limited packsize and not first object */
431         if (!pack_size_limit || !nr_written)
432                 limit = 0;
433         else if (pack_size_limit <= write_offset)
434                 /*
435                  * the earlier object did not fit the limit; avoid
436                  * mistaking this with unlimited (i.e. limit = 0).
437                  */
438                 limit = 1;
439         else
440                 limit = pack_size_limit - write_offset;
441
442         if (!entry->delta)
443                 usable_delta = 0;       /* no delta */
444         else if (!pack_size_limit)
445                usable_delta = 1;        /* unlimited packfile */
446         else if (entry->delta->idx.offset == (off_t)-1)
447                 usable_delta = 0;       /* base was written to another pack */
448         else if (entry->delta->idx.offset)
449                 usable_delta = 1;       /* base already exists in this pack */
450         else
451                 usable_delta = 0;       /* base could end up in another pack */
452
453         if (!reuse_object)
454                 to_reuse = 0;   /* explicit */
455         else if (!entry->in_pack)
456                 to_reuse = 0;   /* can't reuse what we don't have */
457         else if (entry->type == OBJ_REF_DELTA || entry->type == OBJ_OFS_DELTA)
458                                 /* check_object() decided it for us ... */
459                 to_reuse = usable_delta;
460                                 /* ... but pack split may override that */
461         else if (entry->type != entry->in_pack_type)
462                 to_reuse = 0;   /* pack has delta which is unusable */
463         else if (entry->delta)
464                 to_reuse = 0;   /* we want to pack afresh */
465         else
466                 to_reuse = 1;   /* we have it in-pack undeltified,
467                                  * and we do not need to deltify it.
468                                  */
469
470         if (!to_reuse)
471                 len = write_no_reuse_object(f, entry, limit, usable_delta);
472         else
473                 len = write_reuse_object(f, entry, limit, usable_delta);
474         if (!len)
475                 return 0;
476
477         if (usable_delta)
478                 written_delta++;
479         written++;
480         if (!pack_to_stdout)
481                 entry->idx.crc32 = crc32_end(f);
482         return len;
483 }
484
485 enum write_one_status {
486         WRITE_ONE_SKIP = -1, /* already written */
487         WRITE_ONE_BREAK = 0, /* writing this will bust the limit; not written */
488         WRITE_ONE_WRITTEN = 1, /* normal */
489         WRITE_ONE_RECURSIVE = 2 /* already scheduled to be written */
490 };
491
492 static enum write_one_status write_one(struct sha1file *f,
493                                        struct object_entry *e,
494                                        off_t *offset)
495 {
496         unsigned long size;
497         int recursing;
498
499         /*
500          * we set offset to 1 (which is an impossible value) to mark
501          * the fact that this object is involved in "write its base
502          * first before writing a deltified object" recursion.
503          */
504         recursing = (e->idx.offset == 1);
505         if (recursing) {
506                 warning("recursive delta detected for object %s",
507                         sha1_to_hex(e->idx.sha1));
508                 return WRITE_ONE_RECURSIVE;
509         } else if (e->idx.offset || e->preferred_base) {
510                 /* offset is non zero if object is written already. */
511                 return WRITE_ONE_SKIP;
512         }
513
514         /* if we are deltified, write out base object first. */
515         if (e->delta) {
516                 e->idx.offset = 1; /* now recurse */
517                 switch (write_one(f, e->delta, offset)) {
518                 case WRITE_ONE_RECURSIVE:
519                         /* we cannot depend on this one */
520                         e->delta = NULL;
521                         break;
522                 default:
523                         break;
524                 case WRITE_ONE_BREAK:
525                         e->idx.offset = recursing;
526                         return WRITE_ONE_BREAK;
527                 }
528         }
529
530         e->idx.offset = *offset;
531         size = write_object(f, e, *offset);
532         if (!size) {
533                 e->idx.offset = recursing;
534                 return WRITE_ONE_BREAK;
535         }
536         written_list[nr_written++] = &e->idx;
537
538         /* make sure off_t is sufficiently large not to wrap */
539         if (signed_add_overflows(*offset, size))
540                 die("pack too large for current definition of off_t");
541         *offset += size;
542         return WRITE_ONE_WRITTEN;
543 }
544
545 static int mark_tagged(const char *path, const unsigned char *sha1, int flag,
546                        void *cb_data)
547 {
548         unsigned char peeled[20];
549         struct object_entry *entry = packlist_find(&to_pack, sha1, NULL);
550
551         if (entry)
552                 entry->tagged = 1;
553         if (!peel_ref(path, peeled)) {
554                 entry = packlist_find(&to_pack, peeled, NULL);
555                 if (entry)
556                         entry->tagged = 1;
557         }
558         return 0;
559 }
560
561 static inline void add_to_write_order(struct object_entry **wo,
562                                unsigned int *endp,
563                                struct object_entry *e)
564 {
565         if (e->filled)
566                 return;
567         wo[(*endp)++] = e;
568         e->filled = 1;
569 }
570
571 static void add_descendants_to_write_order(struct object_entry **wo,
572                                            unsigned int *endp,
573                                            struct object_entry *e)
574 {
575         int add_to_order = 1;
576         while (e) {
577                 if (add_to_order) {
578                         struct object_entry *s;
579                         /* add this node... */
580                         add_to_write_order(wo, endp, e);
581                         /* all its siblings... */
582                         for (s = e->delta_sibling; s; s = s->delta_sibling) {
583                                 add_to_write_order(wo, endp, s);
584                         }
585                 }
586                 /* drop down a level to add left subtree nodes if possible */
587                 if (e->delta_child) {
588                         add_to_order = 1;
589                         e = e->delta_child;
590                 } else {
591                         add_to_order = 0;
592                         /* our sibling might have some children, it is next */
593                         if (e->delta_sibling) {
594                                 e = e->delta_sibling;
595                                 continue;
596                         }
597                         /* go back to our parent node */
598                         e = e->delta;
599                         while (e && !e->delta_sibling) {
600                                 /* we're on the right side of a subtree, keep
601                                  * going up until we can go right again */
602                                 e = e->delta;
603                         }
604                         if (!e) {
605                                 /* done- we hit our original root node */
606                                 return;
607                         }
608                         /* pass it off to sibling at this level */
609                         e = e->delta_sibling;
610                 }
611         };
612 }
613
614 static void add_family_to_write_order(struct object_entry **wo,
615                                       unsigned int *endp,
616                                       struct object_entry *e)
617 {
618         struct object_entry *root;
619
620         for (root = e; root->delta; root = root->delta)
621                 ; /* nothing */
622         add_descendants_to_write_order(wo, endp, root);
623 }
624
625 static struct object_entry **compute_write_order(void)
626 {
627         unsigned int i, wo_end, last_untagged;
628
629         struct object_entry **wo = xmalloc(to_pack.nr_objects * sizeof(*wo));
630         struct object_entry *objects = to_pack.objects;
631
632         for (i = 0; i < to_pack.nr_objects; i++) {
633                 objects[i].tagged = 0;
634                 objects[i].filled = 0;
635                 objects[i].delta_child = NULL;
636                 objects[i].delta_sibling = NULL;
637         }
638
639         /*
640          * Fully connect delta_child/delta_sibling network.
641          * Make sure delta_sibling is sorted in the original
642          * recency order.
643          */
644         for (i = to_pack.nr_objects; i > 0;) {
645                 struct object_entry *e = &objects[--i];
646                 if (!e->delta)
647                         continue;
648                 /* Mark me as the first child */
649                 e->delta_sibling = e->delta->delta_child;
650                 e->delta->delta_child = e;
651         }
652
653         /*
654          * Mark objects that are at the tip of tags.
655          */
656         for_each_tag_ref(mark_tagged, NULL);
657
658         /*
659          * Give the objects in the original recency order until
660          * we see a tagged tip.
661          */
662         for (i = wo_end = 0; i < to_pack.nr_objects; i++) {
663                 if (objects[i].tagged)
664                         break;
665                 add_to_write_order(wo, &wo_end, &objects[i]);
666         }
667         last_untagged = i;
668
669         /*
670          * Then fill all the tagged tips.
671          */
672         for (; i < to_pack.nr_objects; i++) {
673                 if (objects[i].tagged)
674                         add_to_write_order(wo, &wo_end, &objects[i]);
675         }
676
677         /*
678          * And then all remaining commits and tags.
679          */
680         for (i = last_untagged; i < to_pack.nr_objects; i++) {
681                 if (objects[i].type != OBJ_COMMIT &&
682                     objects[i].type != OBJ_TAG)
683                         continue;
684                 add_to_write_order(wo, &wo_end, &objects[i]);
685         }
686
687         /*
688          * And then all the trees.
689          */
690         for (i = last_untagged; i < to_pack.nr_objects; i++) {
691                 if (objects[i].type != OBJ_TREE)
692                         continue;
693                 add_to_write_order(wo, &wo_end, &objects[i]);
694         }
695
696         /*
697          * Finally all the rest in really tight order
698          */
699         for (i = last_untagged; i < to_pack.nr_objects; i++) {
700                 if (!objects[i].filled)
701                         add_family_to_write_order(wo, &wo_end, &objects[i]);
702         }
703
704         if (wo_end != to_pack.nr_objects)
705                 die("ordered %u objects, expected %"PRIu32, wo_end, to_pack.nr_objects);
706
707         return wo;
708 }
709
710 static off_t write_reused_pack(struct sha1file *f)
711 {
712         unsigned char buffer[8192];
713         off_t to_write, total;
714         int fd;
715
716         if (!is_pack_valid(reuse_packfile))
717                 die("packfile is invalid: %s", reuse_packfile->pack_name);
718
719         fd = git_open_noatime(reuse_packfile->pack_name);
720         if (fd < 0)
721                 die_errno("unable to open packfile for reuse: %s",
722                           reuse_packfile->pack_name);
723
724         if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1)
725                 die_errno("unable to seek in reused packfile");
726
727         if (reuse_packfile_offset < 0)
728                 reuse_packfile_offset = reuse_packfile->pack_size - 20;
729
730         total = to_write = reuse_packfile_offset - sizeof(struct pack_header);
731
732         while (to_write) {
733                 int read_pack = xread(fd, buffer, sizeof(buffer));
734
735                 if (read_pack <= 0)
736                         die_errno("unable to read from reused packfile");
737
738                 if (read_pack > to_write)
739                         read_pack = to_write;
740
741                 sha1write(f, buffer, read_pack);
742                 to_write -= read_pack;
743
744                 /*
745                  * We don't know the actual number of objects written,
746                  * only how many bytes written, how many bytes total, and
747                  * how many objects total. So we can fake it by pretending all
748                  * objects we are writing are the same size. This gives us a
749                  * smooth progress meter, and at the end it matches the true
750                  * answer.
751                  */
752                 written = reuse_packfile_objects *
753                                 (((double)(total - to_write)) / total);
754                 display_progress(progress_state, written);
755         }
756
757         close(fd);
758         written = reuse_packfile_objects;
759         display_progress(progress_state, written);
760         return reuse_packfile_offset - sizeof(struct pack_header);
761 }
762
763 static void write_pack_file(void)
764 {
765         uint32_t i = 0, j;
766         struct sha1file *f;
767         off_t offset;
768         uint32_t nr_remaining = nr_result;
769         time_t last_mtime = 0;
770         struct object_entry **write_order;
771
772         if (progress > pack_to_stdout)
773                 progress_state = start_progress(_("Writing objects"), nr_result);
774         written_list = xmalloc(to_pack.nr_objects * sizeof(*written_list));
775         write_order = compute_write_order();
776
777         do {
778                 unsigned char sha1[20];
779                 char *pack_tmp_name = NULL;
780
781                 if (pack_to_stdout)
782                         f = sha1fd_throughput(1, "<stdout>", progress_state);
783                 else
784                         f = create_tmp_packfile(&pack_tmp_name);
785
786                 offset = write_pack_header(f, nr_remaining);
787
788                 if (reuse_packfile) {
789                         off_t packfile_size;
790                         assert(pack_to_stdout);
791
792                         packfile_size = write_reused_pack(f);
793                         offset += packfile_size;
794                 }
795
796                 nr_written = 0;
797                 for (; i < to_pack.nr_objects; i++) {
798                         struct object_entry *e = write_order[i];
799                         if (write_one(f, e, &offset) == WRITE_ONE_BREAK)
800                                 break;
801                         display_progress(progress_state, written);
802                 }
803
804                 /*
805                  * Did we write the wrong # entries in the header?
806                  * If so, rewrite it like in fast-import
807                  */
808                 if (pack_to_stdout) {
809                         sha1close(f, sha1, CSUM_CLOSE);
810                 } else if (nr_written == nr_remaining) {
811                         sha1close(f, sha1, CSUM_FSYNC);
812                 } else {
813                         int fd = sha1close(f, sha1, 0);
814                         fixup_pack_header_footer(fd, sha1, pack_tmp_name,
815                                                  nr_written, sha1, offset);
816                         close(fd);
817                 }
818
819                 if (!pack_to_stdout) {
820                         struct stat st;
821                         struct strbuf tmpname = STRBUF_INIT;
822
823                         /*
824                          * Packs are runtime accessed in their mtime
825                          * order since newer packs are more likely to contain
826                          * younger objects.  So if we are creating multiple
827                          * packs then we should modify the mtime of later ones
828                          * to preserve this property.
829                          */
830                         if (stat(pack_tmp_name, &st) < 0) {
831                                 warning("failed to stat %s: %s",
832                                         pack_tmp_name, strerror(errno));
833                         } else if (!last_mtime) {
834                                 last_mtime = st.st_mtime;
835                         } else {
836                                 struct utimbuf utb;
837                                 utb.actime = st.st_atime;
838                                 utb.modtime = --last_mtime;
839                                 if (utime(pack_tmp_name, &utb) < 0)
840                                         warning("failed utime() on %s: %s",
841                                                 pack_tmp_name, strerror(errno));
842                         }
843
844                         strbuf_addf(&tmpname, "%s-", base_name);
845
846                         if (write_bitmap_index) {
847                                 bitmap_writer_set_checksum(sha1);
848                                 bitmap_writer_build_type_index(written_list, nr_written);
849                         }
850
851                         finish_tmp_packfile(&tmpname, pack_tmp_name,
852                                             written_list, nr_written,
853                                             &pack_idx_opts, sha1);
854
855                         if (write_bitmap_index) {
856                                 strbuf_addf(&tmpname, "%s.bitmap", sha1_to_hex(sha1));
857
858                                 stop_progress(&progress_state);
859
860                                 bitmap_writer_show_progress(progress);
861                                 bitmap_writer_reuse_bitmaps(&to_pack);
862                                 bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
863                                 bitmap_writer_build(&to_pack);
864                                 bitmap_writer_finish(written_list, nr_written,
865                                                      tmpname.buf, write_bitmap_options);
866                                 write_bitmap_index = 0;
867                         }
868
869                         strbuf_release(&tmpname);
870                         free(pack_tmp_name);
871                         puts(sha1_to_hex(sha1));
872                 }
873
874                 /* mark written objects as written to previous pack */
875                 for (j = 0; j < nr_written; j++) {
876                         written_list[j]->offset = (off_t)-1;
877                 }
878                 nr_remaining -= nr_written;
879         } while (nr_remaining && i < to_pack.nr_objects);
880
881         free(written_list);
882         free(write_order);
883         stop_progress(&progress_state);
884         if (written != nr_result)
885                 die("wrote %"PRIu32" objects while expecting %"PRIu32,
886                         written, nr_result);
887 }
888
889 static void setup_delta_attr_check(struct git_attr_check *check)
890 {
891         static struct git_attr *attr_delta;
892
893         if (!attr_delta)
894                 attr_delta = git_attr("delta");
895
896         check[0].attr = attr_delta;
897 }
898
899 static int no_try_delta(const char *path)
900 {
901         struct git_attr_check check[1];
902
903         setup_delta_attr_check(check);
904         if (git_check_attr(path, ARRAY_SIZE(check), check))
905                 return 0;
906         if (ATTR_FALSE(check->value))
907                 return 1;
908         return 0;
909 }
910
911 /*
912  * When adding an object, check whether we have already added it
913  * to our packing list. If so, we can skip. However, if we are
914  * being asked to excludei t, but the previous mention was to include
915  * it, make sure to adjust its flags and tweak our numbers accordingly.
916  *
917  * As an optimization, we pass out the index position where we would have
918  * found the item, since that saves us from having to look it up again a
919  * few lines later when we want to add the new entry.
920  */
921 static int have_duplicate_entry(const unsigned char *sha1,
922                                 int exclude,
923                                 uint32_t *index_pos)
924 {
925         struct object_entry *entry;
926
927         entry = packlist_find(&to_pack, sha1, index_pos);
928         if (!entry)
929                 return 0;
930
931         if (exclude) {
932                 if (!entry->preferred_base)
933                         nr_result--;
934                 entry->preferred_base = 1;
935         }
936
937         return 1;
938 }
939
940 /*
941  * Check whether we want the object in the pack (e.g., we do not want
942  * objects found in non-local stores if the "--local" option was used).
943  *
944  * As a side effect of this check, we will find the packed version of this
945  * object, if any. We therefore pass out the pack information to avoid having
946  * to look it up again later.
947  */
948 static int want_object_in_pack(const unsigned char *sha1,
949                                int exclude,
950                                struct packed_git **found_pack,
951                                off_t *found_offset)
952 {
953         struct packed_git *p;
954
955         if (!exclude && local && has_loose_object_nonlocal(sha1))
956                 return 0;
957
958         *found_pack = NULL;
959         *found_offset = 0;
960
961         for (p = packed_git; p; p = p->next) {
962                 off_t offset = find_pack_entry_one(sha1, p);
963                 if (offset) {
964                         if (!*found_pack) {
965                                 if (!is_pack_valid(p)) {
966                                         warning("packfile %s cannot be accessed", p->pack_name);
967                                         continue;
968                                 }
969                                 *found_offset = offset;
970                                 *found_pack = p;
971                         }
972                         if (exclude)
973                                 return 1;
974                         if (incremental)
975                                 return 0;
976                         if (local && !p->pack_local)
977                                 return 0;
978                         if (ignore_packed_keep && p->pack_local && p->pack_keep)
979                                 return 0;
980                 }
981         }
982
983         return 1;
984 }
985
986 static void create_object_entry(const unsigned char *sha1,
987                                 enum object_type type,
988                                 uint32_t hash,
989                                 int exclude,
990                                 int no_try_delta,
991                                 uint32_t index_pos,
992                                 struct packed_git *found_pack,
993                                 off_t found_offset)
994 {
995         struct object_entry *entry;
996
997         entry = packlist_alloc(&to_pack, sha1, index_pos);
998         entry->hash = hash;
999         if (type)
1000                 entry->type = type;
1001         if (exclude)
1002                 entry->preferred_base = 1;
1003         else
1004                 nr_result++;
1005         if (found_pack) {
1006                 entry->in_pack = found_pack;
1007                 entry->in_pack_offset = found_offset;
1008         }
1009
1010         entry->no_try_delta = no_try_delta;
1011 }
1012
1013 static const char no_closure_warning[] = N_(
1014 "disabling bitmap writing, as some objects are not being packed"
1015 );
1016
1017 static int add_object_entry(const unsigned char *sha1, enum object_type type,
1018                             const char *name, int exclude)
1019 {
1020         struct packed_git *found_pack;
1021         off_t found_offset;
1022         uint32_t index_pos;
1023
1024         if (have_duplicate_entry(sha1, exclude, &index_pos))
1025                 return 0;
1026
1027         if (!want_object_in_pack(sha1, exclude, &found_pack, &found_offset)) {
1028                 /* The pack is missing an object, so it will not have closure */
1029                 if (write_bitmap_index) {
1030                         warning(_(no_closure_warning));
1031                         write_bitmap_index = 0;
1032                 }
1033                 return 0;
1034         }
1035
1036         create_object_entry(sha1, type, pack_name_hash(name),
1037                             exclude, name && no_try_delta(name),
1038                             index_pos, found_pack, found_offset);
1039
1040         display_progress(progress_state, nr_result);
1041         return 1;
1042 }
1043
1044 static int add_object_entry_from_bitmap(const unsigned char *sha1,
1045                                         enum object_type type,
1046                                         int flags, uint32_t name_hash,
1047                                         struct packed_git *pack, off_t offset)
1048 {
1049         uint32_t index_pos;
1050
1051         if (have_duplicate_entry(sha1, 0, &index_pos))
1052                 return 0;
1053
1054         create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset);
1055
1056         display_progress(progress_state, nr_result);
1057         return 1;
1058 }
1059
1060 struct pbase_tree_cache {
1061         unsigned char sha1[20];
1062         int ref;
1063         int temporary;
1064         void *tree_data;
1065         unsigned long tree_size;
1066 };
1067
1068 static struct pbase_tree_cache *(pbase_tree_cache[256]);
1069 static int pbase_tree_cache_ix(const unsigned char *sha1)
1070 {
1071         return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
1072 }
1073 static int pbase_tree_cache_ix_incr(int ix)
1074 {
1075         return (ix+1) % ARRAY_SIZE(pbase_tree_cache);
1076 }
1077
1078 static struct pbase_tree {
1079         struct pbase_tree *next;
1080         /* This is a phony "cache" entry; we are not
1081          * going to evict it or find it through _get()
1082          * mechanism -- this is for the toplevel node that
1083          * would almost always change with any commit.
1084          */
1085         struct pbase_tree_cache pcache;
1086 } *pbase_tree;
1087
1088 static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
1089 {
1090         struct pbase_tree_cache *ent, *nent;
1091         void *data;
1092         unsigned long size;
1093         enum object_type type;
1094         int neigh;
1095         int my_ix = pbase_tree_cache_ix(sha1);
1096         int available_ix = -1;
1097
1098         /* pbase-tree-cache acts as a limited hashtable.
1099          * your object will be found at your index or within a few
1100          * slots after that slot if it is cached.
1101          */
1102         for (neigh = 0; neigh < 8; neigh++) {
1103                 ent = pbase_tree_cache[my_ix];
1104                 if (ent && !hashcmp(ent->sha1, sha1)) {
1105                         ent->ref++;
1106                         return ent;
1107                 }
1108                 else if (((available_ix < 0) && (!ent || !ent->ref)) ||
1109                          ((0 <= available_ix) &&
1110                           (!ent && pbase_tree_cache[available_ix])))
1111                         available_ix = my_ix;
1112                 if (!ent)
1113                         break;
1114                 my_ix = pbase_tree_cache_ix_incr(my_ix);
1115         }
1116
1117         /* Did not find one.  Either we got a bogus request or
1118          * we need to read and perhaps cache.
1119          */
1120         data = read_sha1_file(sha1, &type, &size);
1121         if (!data)
1122                 return NULL;
1123         if (type != OBJ_TREE) {
1124                 free(data);
1125                 return NULL;
1126         }
1127
1128         /* We need to either cache or return a throwaway copy */
1129
1130         if (available_ix < 0)
1131                 ent = NULL;
1132         else {
1133                 ent = pbase_tree_cache[available_ix];
1134                 my_ix = available_ix;
1135         }
1136
1137         if (!ent) {
1138                 nent = xmalloc(sizeof(*nent));
1139                 nent->temporary = (available_ix < 0);
1140         }
1141         else {
1142                 /* evict and reuse */
1143                 free(ent->tree_data);
1144                 nent = ent;
1145         }
1146         hashcpy(nent->sha1, sha1);
1147         nent->tree_data = data;
1148         nent->tree_size = size;
1149         nent->ref = 1;
1150         if (!nent->temporary)
1151                 pbase_tree_cache[my_ix] = nent;
1152         return nent;
1153 }
1154
1155 static void pbase_tree_put(struct pbase_tree_cache *cache)
1156 {
1157         if (!cache->temporary) {
1158                 cache->ref--;
1159                 return;
1160         }
1161         free(cache->tree_data);
1162         free(cache);
1163 }
1164
1165 static int name_cmp_len(const char *name)
1166 {
1167         int i;
1168         for (i = 0; name[i] && name[i] != '\n' && name[i] != '/'; i++)
1169                 ;
1170         return i;
1171 }
1172
1173 static void add_pbase_object(struct tree_desc *tree,
1174                              const char *name,
1175                              int cmplen,
1176                              const char *fullname)
1177 {
1178         struct name_entry entry;
1179         int cmp;
1180
1181         while (tree_entry(tree,&entry)) {
1182                 if (S_ISGITLINK(entry.mode))
1183                         continue;
1184                 cmp = tree_entry_len(&entry) != cmplen ? 1 :
1185                       memcmp(name, entry.path, cmplen);
1186                 if (cmp > 0)
1187                         continue;
1188                 if (cmp < 0)
1189                         return;
1190                 if (name[cmplen] != '/') {
1191                         add_object_entry(entry.sha1,
1192                                          object_type(entry.mode),
1193                                          fullname, 1);
1194                         return;
1195                 }
1196                 if (S_ISDIR(entry.mode)) {
1197                         struct tree_desc sub;
1198                         struct pbase_tree_cache *tree;
1199                         const char *down = name+cmplen+1;
1200                         int downlen = name_cmp_len(down);
1201
1202                         tree = pbase_tree_get(entry.sha1);
1203                         if (!tree)
1204                                 return;
1205                         init_tree_desc(&sub, tree->tree_data, tree->tree_size);
1206
1207                         add_pbase_object(&sub, down, downlen, fullname);
1208                         pbase_tree_put(tree);
1209                 }
1210         }
1211 }
1212
1213 static unsigned *done_pbase_paths;
1214 static int done_pbase_paths_num;
1215 static int done_pbase_paths_alloc;
1216 static int done_pbase_path_pos(unsigned hash)
1217 {
1218         int lo = 0;
1219         int hi = done_pbase_paths_num;
1220         while (lo < hi) {
1221                 int mi = (hi + lo) / 2;
1222                 if (done_pbase_paths[mi] == hash)
1223                         return mi;
1224                 if (done_pbase_paths[mi] < hash)
1225                         hi = mi;
1226                 else
1227                         lo = mi + 1;
1228         }
1229         return -lo-1;
1230 }
1231
1232 static int check_pbase_path(unsigned hash)
1233 {
1234         int pos = (!done_pbase_paths) ? -1 : done_pbase_path_pos(hash);
1235         if (0 <= pos)
1236                 return 1;
1237         pos = -pos - 1;
1238         ALLOC_GROW(done_pbase_paths,
1239                    done_pbase_paths_num + 1,
1240                    done_pbase_paths_alloc);
1241         done_pbase_paths_num++;
1242         if (pos < done_pbase_paths_num)
1243                 memmove(done_pbase_paths + pos + 1,
1244                         done_pbase_paths + pos,
1245                         (done_pbase_paths_num - pos - 1) * sizeof(unsigned));
1246         done_pbase_paths[pos] = hash;
1247         return 0;
1248 }
1249
1250 static void add_preferred_base_object(const char *name)
1251 {
1252         struct pbase_tree *it;
1253         int cmplen;
1254         unsigned hash = pack_name_hash(name);
1255
1256         if (!num_preferred_base || check_pbase_path(hash))
1257                 return;
1258
1259         cmplen = name_cmp_len(name);
1260         for (it = pbase_tree; it; it = it->next) {
1261                 if (cmplen == 0) {
1262                         add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
1263                 }
1264                 else {
1265                         struct tree_desc tree;
1266                         init_tree_desc(&tree, it->pcache.tree_data, it->pcache.tree_size);
1267                         add_pbase_object(&tree, name, cmplen, name);
1268                 }
1269         }
1270 }
1271
1272 static void add_preferred_base(unsigned char *sha1)
1273 {
1274         struct pbase_tree *it;
1275         void *data;
1276         unsigned long size;
1277         unsigned char tree_sha1[20];
1278
1279         if (window <= num_preferred_base++)
1280                 return;
1281
1282         data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
1283         if (!data)
1284                 return;
1285
1286         for (it = pbase_tree; it; it = it->next) {
1287                 if (!hashcmp(it->pcache.sha1, tree_sha1)) {
1288                         free(data);
1289                         return;
1290                 }
1291         }
1292
1293         it = xcalloc(1, sizeof(*it));
1294         it->next = pbase_tree;
1295         pbase_tree = it;
1296
1297         hashcpy(it->pcache.sha1, tree_sha1);
1298         it->pcache.tree_data = data;
1299         it->pcache.tree_size = size;
1300 }
1301
1302 static void cleanup_preferred_base(void)
1303 {
1304         struct pbase_tree *it;
1305         unsigned i;
1306
1307         it = pbase_tree;
1308         pbase_tree = NULL;
1309         while (it) {
1310                 struct pbase_tree *this = it;
1311                 it = this->next;
1312                 free(this->pcache.tree_data);
1313                 free(this);
1314         }
1315
1316         for (i = 0; i < ARRAY_SIZE(pbase_tree_cache); i++) {
1317                 if (!pbase_tree_cache[i])
1318                         continue;
1319                 free(pbase_tree_cache[i]->tree_data);
1320                 free(pbase_tree_cache[i]);
1321                 pbase_tree_cache[i] = NULL;
1322         }
1323
1324         free(done_pbase_paths);
1325         done_pbase_paths = NULL;
1326         done_pbase_paths_num = done_pbase_paths_alloc = 0;
1327 }
1328
1329 static void check_object(struct object_entry *entry)
1330 {
1331         if (entry->in_pack) {
1332                 struct packed_git *p = entry->in_pack;
1333                 struct pack_window *w_curs = NULL;
1334                 const unsigned char *base_ref = NULL;
1335                 struct object_entry *base_entry;
1336                 unsigned long used, used_0;
1337                 unsigned long avail;
1338                 off_t ofs;
1339                 unsigned char *buf, c;
1340
1341                 buf = use_pack(p, &w_curs, entry->in_pack_offset, &avail);
1342
1343                 /*
1344                  * We want in_pack_type even if we do not reuse delta
1345                  * since non-delta representations could still be reused.
1346                  */
1347                 used = unpack_object_header_buffer(buf, avail,
1348                                                    &entry->in_pack_type,
1349                                                    &entry->size);
1350                 if (used == 0)
1351                         goto give_up;
1352
1353                 /*
1354                  * Determine if this is a delta and if so whether we can
1355                  * reuse it or not.  Otherwise let's find out as cheaply as
1356                  * possible what the actual type and size for this object is.
1357                  */
1358                 switch (entry->in_pack_type) {
1359                 default:
1360                         /* Not a delta hence we've already got all we need. */
1361                         entry->type = entry->in_pack_type;
1362                         entry->in_pack_header_size = used;
1363                         if (entry->type < OBJ_COMMIT || entry->type > OBJ_BLOB)
1364                                 goto give_up;
1365                         unuse_pack(&w_curs);
1366                         return;
1367                 case OBJ_REF_DELTA:
1368                         if (reuse_delta && !entry->preferred_base)
1369                                 base_ref = use_pack(p, &w_curs,
1370                                                 entry->in_pack_offset + used, NULL);
1371                         entry->in_pack_header_size = used + 20;
1372                         break;
1373                 case OBJ_OFS_DELTA:
1374                         buf = use_pack(p, &w_curs,
1375                                        entry->in_pack_offset + used, NULL);
1376                         used_0 = 0;
1377                         c = buf[used_0++];
1378                         ofs = c & 127;
1379                         while (c & 128) {
1380                                 ofs += 1;
1381                                 if (!ofs || MSB(ofs, 7)) {
1382                                         error("delta base offset overflow in pack for %s",
1383                                               sha1_to_hex(entry->idx.sha1));
1384                                         goto give_up;
1385                                 }
1386                                 c = buf[used_0++];
1387                                 ofs = (ofs << 7) + (c & 127);
1388                         }
1389                         ofs = entry->in_pack_offset - ofs;
1390                         if (ofs <= 0 || ofs >= entry->in_pack_offset) {
1391                                 error("delta base offset out of bound for %s",
1392                                       sha1_to_hex(entry->idx.sha1));
1393                                 goto give_up;
1394                         }
1395                         if (reuse_delta && !entry->preferred_base) {
1396                                 struct revindex_entry *revidx;
1397                                 revidx = find_pack_revindex(p, ofs);
1398                                 if (!revidx)
1399                                         goto give_up;
1400                                 base_ref = nth_packed_object_sha1(p, revidx->nr);
1401                         }
1402                         entry->in_pack_header_size = used + used_0;
1403                         break;
1404                 }
1405
1406                 if (base_ref && (base_entry = packlist_find(&to_pack, base_ref, NULL))) {
1407                         /*
1408                          * If base_ref was set above that means we wish to
1409                          * reuse delta data, and we even found that base
1410                          * in the list of objects we want to pack. Goodie!
1411                          *
1412                          * Depth value does not matter - find_deltas() will
1413                          * never consider reused delta as the base object to
1414                          * deltify other objects against, in order to avoid
1415                          * circular deltas.
1416                          */
1417                         entry->type = entry->in_pack_type;
1418                         entry->delta = base_entry;
1419                         entry->delta_size = entry->size;
1420                         entry->delta_sibling = base_entry->delta_child;
1421                         base_entry->delta_child = entry;
1422                         unuse_pack(&w_curs);
1423                         return;
1424                 }
1425
1426                 if (entry->type) {
1427                         /*
1428                          * This must be a delta and we already know what the
1429                          * final object type is.  Let's extract the actual
1430                          * object size from the delta header.
1431                          */
1432                         entry->size = get_size_from_delta(p, &w_curs,
1433                                         entry->in_pack_offset + entry->in_pack_header_size);
1434                         if (entry->size == 0)
1435                                 goto give_up;
1436                         unuse_pack(&w_curs);
1437                         return;
1438                 }
1439
1440                 /*
1441                  * No choice but to fall back to the recursive delta walk
1442                  * with sha1_object_info() to find about the object type
1443                  * at this point...
1444                  */
1445                 give_up:
1446                 unuse_pack(&w_curs);
1447         }
1448
1449         entry->type = sha1_object_info(entry->idx.sha1, &entry->size);
1450         /*
1451          * The error condition is checked in prepare_pack().  This is
1452          * to permit a missing preferred base object to be ignored
1453          * as a preferred base.  Doing so can result in a larger
1454          * pack file, but the transfer will still take place.
1455          */
1456 }
1457
1458 static int pack_offset_sort(const void *_a, const void *_b)
1459 {
1460         const struct object_entry *a = *(struct object_entry **)_a;
1461         const struct object_entry *b = *(struct object_entry **)_b;
1462
1463         /* avoid filesystem trashing with loose objects */
1464         if (!a->in_pack && !b->in_pack)
1465                 return hashcmp(a->idx.sha1, b->idx.sha1);
1466
1467         if (a->in_pack < b->in_pack)
1468                 return -1;
1469         if (a->in_pack > b->in_pack)
1470                 return 1;
1471         return a->in_pack_offset < b->in_pack_offset ? -1 :
1472                         (a->in_pack_offset > b->in_pack_offset);
1473 }
1474
1475 static void get_object_details(void)
1476 {
1477         uint32_t i;
1478         struct object_entry **sorted_by_offset;
1479
1480         sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
1481         for (i = 0; i < to_pack.nr_objects; i++)
1482                 sorted_by_offset[i] = to_pack.objects + i;
1483         qsort(sorted_by_offset, to_pack.nr_objects, sizeof(*sorted_by_offset), pack_offset_sort);
1484
1485         for (i = 0; i < to_pack.nr_objects; i++) {
1486                 struct object_entry *entry = sorted_by_offset[i];
1487                 check_object(entry);
1488                 if (big_file_threshold < entry->size)
1489                         entry->no_try_delta = 1;
1490         }
1491
1492         free(sorted_by_offset);
1493 }
1494
1495 /*
1496  * We search for deltas in a list sorted by type, by filename hash, and then
1497  * by size, so that we see progressively smaller and smaller files.
1498  * That's because we prefer deltas to be from the bigger file
1499  * to the smaller -- deletes are potentially cheaper, but perhaps
1500  * more importantly, the bigger file is likely the more recent
1501  * one.  The deepest deltas are therefore the oldest objects which are
1502  * less susceptible to be accessed often.
1503  */
1504 static int type_size_sort(const void *_a, const void *_b)
1505 {
1506         const struct object_entry *a = *(struct object_entry **)_a;
1507         const struct object_entry *b = *(struct object_entry **)_b;
1508
1509         if (a->type > b->type)
1510                 return -1;
1511         if (a->type < b->type)
1512                 return 1;
1513         if (a->hash > b->hash)
1514                 return -1;
1515         if (a->hash < b->hash)
1516                 return 1;
1517         if (a->preferred_base > b->preferred_base)
1518                 return -1;
1519         if (a->preferred_base < b->preferred_base)
1520                 return 1;
1521         if (a->size > b->size)
1522                 return -1;
1523         if (a->size < b->size)
1524                 return 1;
1525         return a < b ? -1 : (a > b);  /* newest first */
1526 }
1527
1528 struct unpacked {
1529         struct object_entry *entry;
1530         void *data;
1531         struct delta_index *index;
1532         unsigned depth;
1533 };
1534
1535 static int delta_cacheable(unsigned long src_size, unsigned long trg_size,
1536                            unsigned long delta_size)
1537 {
1538         if (max_delta_cache_size && delta_cache_size + delta_size > max_delta_cache_size)
1539                 return 0;
1540
1541         if (delta_size < cache_max_small_delta_size)
1542                 return 1;
1543
1544         /* cache delta, if objects are large enough compared to delta size */
1545         if ((src_size >> 20) + (trg_size >> 21) > (delta_size >> 10))
1546                 return 1;
1547
1548         return 0;
1549 }
1550
1551 #ifndef NO_PTHREADS
1552
1553 static pthread_mutex_t read_mutex;
1554 #define read_lock()             pthread_mutex_lock(&read_mutex)
1555 #define read_unlock()           pthread_mutex_unlock(&read_mutex)
1556
1557 static pthread_mutex_t cache_mutex;
1558 #define cache_lock()            pthread_mutex_lock(&cache_mutex)
1559 #define cache_unlock()          pthread_mutex_unlock(&cache_mutex)
1560
1561 static pthread_mutex_t progress_mutex;
1562 #define progress_lock()         pthread_mutex_lock(&progress_mutex)
1563 #define progress_unlock()       pthread_mutex_unlock(&progress_mutex)
1564
1565 #else
1566
1567 #define read_lock()             (void)0
1568 #define read_unlock()           (void)0
1569 #define cache_lock()            (void)0
1570 #define cache_unlock()          (void)0
1571 #define progress_lock()         (void)0
1572 #define progress_unlock()       (void)0
1573
1574 #endif
1575
1576 static int try_delta(struct unpacked *trg, struct unpacked *src,
1577                      unsigned max_depth, unsigned long *mem_usage)
1578 {
1579         struct object_entry *trg_entry = trg->entry;
1580         struct object_entry *src_entry = src->entry;
1581         unsigned long trg_size, src_size, delta_size, sizediff, max_size, sz;
1582         unsigned ref_depth;
1583         enum object_type type;
1584         void *delta_buf;
1585
1586         /* Don't bother doing diffs between different types */
1587         if (trg_entry->type != src_entry->type)
1588                 return -1;
1589
1590         /*
1591          * We do not bother to try a delta that we discarded on an
1592          * earlier try, but only when reusing delta data.  Note that
1593          * src_entry that is marked as the preferred_base should always
1594          * be considered, as even if we produce a suboptimal delta against
1595          * it, we will still save the transfer cost, as we already know
1596          * the other side has it and we won't send src_entry at all.
1597          */
1598         if (reuse_delta && trg_entry->in_pack &&
1599             trg_entry->in_pack == src_entry->in_pack &&
1600             !src_entry->preferred_base &&
1601             trg_entry->in_pack_type != OBJ_REF_DELTA &&
1602             trg_entry->in_pack_type != OBJ_OFS_DELTA)
1603                 return 0;
1604
1605         /* Let's not bust the allowed depth. */
1606         if (src->depth >= max_depth)
1607                 return 0;
1608
1609         /* Now some size filtering heuristics. */
1610         trg_size = trg_entry->size;
1611         if (!trg_entry->delta) {
1612                 max_size = trg_size/2 - 20;
1613                 ref_depth = 1;
1614         } else {
1615                 max_size = trg_entry->delta_size;
1616                 ref_depth = trg->depth;
1617         }
1618         max_size = (uint64_t)max_size * (max_depth - src->depth) /
1619                                                 (max_depth - ref_depth + 1);
1620         if (max_size == 0)
1621                 return 0;
1622         src_size = src_entry->size;
1623         sizediff = src_size < trg_size ? trg_size - src_size : 0;
1624         if (sizediff >= max_size)
1625                 return 0;
1626         if (trg_size < src_size / 32)
1627                 return 0;
1628
1629         /* Load data if not already done */
1630         if (!trg->data) {
1631                 read_lock();
1632                 trg->data = read_sha1_file(trg_entry->idx.sha1, &type, &sz);
1633                 read_unlock();
1634                 if (!trg->data)
1635                         die("object %s cannot be read",
1636                             sha1_to_hex(trg_entry->idx.sha1));
1637                 if (sz != trg_size)
1638                         die("object %s inconsistent object length (%lu vs %lu)",
1639                             sha1_to_hex(trg_entry->idx.sha1), sz, trg_size);
1640                 *mem_usage += sz;
1641         }
1642         if (!src->data) {
1643                 read_lock();
1644                 src->data = read_sha1_file(src_entry->idx.sha1, &type, &sz);
1645                 read_unlock();
1646                 if (!src->data) {
1647                         if (src_entry->preferred_base) {
1648                                 static int warned = 0;
1649                                 if (!warned++)
1650                                         warning("object %s cannot be read",
1651                                                 sha1_to_hex(src_entry->idx.sha1));
1652                                 /*
1653                                  * Those objects are not included in the
1654                                  * resulting pack.  Be resilient and ignore
1655                                  * them if they can't be read, in case the
1656                                  * pack could be created nevertheless.
1657                                  */
1658                                 return 0;
1659                         }
1660                         die("object %s cannot be read",
1661                             sha1_to_hex(src_entry->idx.sha1));
1662                 }
1663                 if (sz != src_size)
1664                         die("object %s inconsistent object length (%lu vs %lu)",
1665                             sha1_to_hex(src_entry->idx.sha1), sz, src_size);
1666                 *mem_usage += sz;
1667         }
1668         if (!src->index) {
1669                 src->index = create_delta_index(src->data, src_size);
1670                 if (!src->index) {
1671                         static int warned = 0;
1672                         if (!warned++)
1673                                 warning("suboptimal pack - out of memory");
1674                         return 0;
1675                 }
1676                 *mem_usage += sizeof_delta_index(src->index);
1677         }
1678
1679         delta_buf = create_delta(src->index, trg->data, trg_size, &delta_size, max_size);
1680         if (!delta_buf)
1681                 return 0;
1682
1683         if (trg_entry->delta) {
1684                 /* Prefer only shallower same-sized deltas. */
1685                 if (delta_size == trg_entry->delta_size &&
1686                     src->depth + 1 >= trg->depth) {
1687                         free(delta_buf);
1688                         return 0;
1689                 }
1690         }
1691
1692         /*
1693          * Handle memory allocation outside of the cache
1694          * accounting lock.  Compiler will optimize the strangeness
1695          * away when NO_PTHREADS is defined.
1696          */
1697         free(trg_entry->delta_data);
1698         cache_lock();
1699         if (trg_entry->delta_data) {
1700                 delta_cache_size -= trg_entry->delta_size;
1701                 trg_entry->delta_data = NULL;
1702         }
1703         if (delta_cacheable(src_size, trg_size, delta_size)) {
1704                 delta_cache_size += delta_size;
1705                 cache_unlock();
1706                 trg_entry->delta_data = xrealloc(delta_buf, delta_size);
1707         } else {
1708                 cache_unlock();
1709                 free(delta_buf);
1710         }
1711
1712         trg_entry->delta = src_entry;
1713         trg_entry->delta_size = delta_size;
1714         trg->depth = src->depth + 1;
1715
1716         return 1;
1717 }
1718
1719 static unsigned int check_delta_limit(struct object_entry *me, unsigned int n)
1720 {
1721         struct object_entry *child = me->delta_child;
1722         unsigned int m = n;
1723         while (child) {
1724                 unsigned int c = check_delta_limit(child, n + 1);
1725                 if (m < c)
1726                         m = c;
1727                 child = child->delta_sibling;
1728         }
1729         return m;
1730 }
1731
1732 static unsigned long free_unpacked(struct unpacked *n)
1733 {
1734         unsigned long freed_mem = sizeof_delta_index(n->index);
1735         free_delta_index(n->index);
1736         n->index = NULL;
1737         if (n->data) {
1738                 freed_mem += n->entry->size;
1739                 free(n->data);
1740                 n->data = NULL;
1741         }
1742         n->entry = NULL;
1743         n->depth = 0;
1744         return freed_mem;
1745 }
1746
1747 static void find_deltas(struct object_entry **list, unsigned *list_size,
1748                         int window, int depth, unsigned *processed)
1749 {
1750         uint32_t i, idx = 0, count = 0;
1751         struct unpacked *array;
1752         unsigned long mem_usage = 0;
1753
1754         array = xcalloc(window, sizeof(struct unpacked));
1755
1756         for (;;) {
1757                 struct object_entry *entry;
1758                 struct unpacked *n = array + idx;
1759                 int j, max_depth, best_base = -1;
1760
1761                 progress_lock();
1762                 if (!*list_size) {
1763                         progress_unlock();
1764                         break;
1765                 }
1766                 entry = *list++;
1767                 (*list_size)--;
1768                 if (!entry->preferred_base) {
1769                         (*processed)++;
1770                         display_progress(progress_state, *processed);
1771                 }
1772                 progress_unlock();
1773
1774                 mem_usage -= free_unpacked(n);
1775                 n->entry = entry;
1776
1777                 while (window_memory_limit &&
1778                        mem_usage > window_memory_limit &&
1779                        count > 1) {
1780                         uint32_t tail = (idx + window - count) % window;
1781                         mem_usage -= free_unpacked(array + tail);
1782                         count--;
1783                 }
1784
1785                 /* We do not compute delta to *create* objects we are not
1786                  * going to pack.
1787                  */
1788                 if (entry->preferred_base)
1789                         goto next;
1790
1791                 /*
1792                  * If the current object is at pack edge, take the depth the
1793                  * objects that depend on the current object into account
1794                  * otherwise they would become too deep.
1795                  */
1796                 max_depth = depth;
1797                 if (entry->delta_child) {
1798                         max_depth -= check_delta_limit(entry, 0);
1799                         if (max_depth <= 0)
1800                                 goto next;
1801                 }
1802
1803                 j = window;
1804                 while (--j > 0) {
1805                         int ret;
1806                         uint32_t other_idx = idx + j;
1807                         struct unpacked *m;
1808                         if (other_idx >= window)
1809                                 other_idx -= window;
1810                         m = array + other_idx;
1811                         if (!m->entry)
1812                                 break;
1813                         ret = try_delta(n, m, max_depth, &mem_usage);
1814                         if (ret < 0)
1815                                 break;
1816                         else if (ret > 0)
1817                                 best_base = other_idx;
1818                 }
1819
1820                 /*
1821                  * If we decided to cache the delta data, then it is best
1822                  * to compress it right away.  First because we have to do
1823                  * it anyway, and doing it here while we're threaded will
1824                  * save a lot of time in the non threaded write phase,
1825                  * as well as allow for caching more deltas within
1826                  * the same cache size limit.
1827                  * ...
1828                  * But only if not writing to stdout, since in that case
1829                  * the network is most likely throttling writes anyway,
1830                  * and therefore it is best to go to the write phase ASAP
1831                  * instead, as we can afford spending more time compressing
1832                  * between writes at that moment.
1833                  */
1834                 if (entry->delta_data && !pack_to_stdout) {
1835                         entry->z_delta_size = do_compress(&entry->delta_data,
1836                                                           entry->delta_size);
1837                         cache_lock();
1838                         delta_cache_size -= entry->delta_size;
1839                         delta_cache_size += entry->z_delta_size;
1840                         cache_unlock();
1841                 }
1842
1843                 /* if we made n a delta, and if n is already at max
1844                  * depth, leaving it in the window is pointless.  we
1845                  * should evict it first.
1846                  */
1847                 if (entry->delta && max_depth <= n->depth)
1848                         continue;
1849
1850                 /*
1851                  * Move the best delta base up in the window, after the
1852                  * currently deltified object, to keep it longer.  It will
1853                  * be the first base object to be attempted next.
1854                  */
1855                 if (entry->delta) {
1856                         struct unpacked swap = array[best_base];
1857                         int dist = (window + idx - best_base) % window;
1858                         int dst = best_base;
1859                         while (dist--) {
1860                                 int src = (dst + 1) % window;
1861                                 array[dst] = array[src];
1862                                 dst = src;
1863                         }
1864                         array[dst] = swap;
1865                 }
1866
1867                 next:
1868                 idx++;
1869                 if (count + 1 < window)
1870                         count++;
1871                 if (idx >= window)
1872                         idx = 0;
1873         }
1874
1875         for (i = 0; i < window; ++i) {
1876                 free_delta_index(array[i].index);
1877                 free(array[i].data);
1878         }
1879         free(array);
1880 }
1881
1882 #ifndef NO_PTHREADS
1883
1884 static void try_to_free_from_threads(size_t size)
1885 {
1886         read_lock();
1887         release_pack_memory(size);
1888         read_unlock();
1889 }
1890
1891 static try_to_free_t old_try_to_free_routine;
1892
1893 /*
1894  * The main thread waits on the condition that (at least) one of the workers
1895  * has stopped working (which is indicated in the .working member of
1896  * struct thread_params).
1897  * When a work thread has completed its work, it sets .working to 0 and
1898  * signals the main thread and waits on the condition that .data_ready
1899  * becomes 1.
1900  */
1901
1902 struct thread_params {
1903         pthread_t thread;
1904         struct object_entry **list;
1905         unsigned list_size;
1906         unsigned remaining;
1907         int window;
1908         int depth;
1909         int working;
1910         int data_ready;
1911         pthread_mutex_t mutex;
1912         pthread_cond_t cond;
1913         unsigned *processed;
1914 };
1915
1916 static pthread_cond_t progress_cond;
1917
1918 /*
1919  * Mutex and conditional variable can't be statically-initialized on Windows.
1920  */
1921 static void init_threaded_search(void)
1922 {
1923         init_recursive_mutex(&read_mutex);
1924         pthread_mutex_init(&cache_mutex, NULL);
1925         pthread_mutex_init(&progress_mutex, NULL);
1926         pthread_cond_init(&progress_cond, NULL);
1927         old_try_to_free_routine = set_try_to_free_routine(try_to_free_from_threads);
1928 }
1929
1930 static void cleanup_threaded_search(void)
1931 {
1932         set_try_to_free_routine(old_try_to_free_routine);
1933         pthread_cond_destroy(&progress_cond);
1934         pthread_mutex_destroy(&read_mutex);
1935         pthread_mutex_destroy(&cache_mutex);
1936         pthread_mutex_destroy(&progress_mutex);
1937 }
1938
1939 static void *threaded_find_deltas(void *arg)
1940 {
1941         struct thread_params *me = arg;
1942
1943         while (me->remaining) {
1944                 find_deltas(me->list, &me->remaining,
1945                             me->window, me->depth, me->processed);
1946
1947                 progress_lock();
1948                 me->working = 0;
1949                 pthread_cond_signal(&progress_cond);
1950                 progress_unlock();
1951
1952                 /*
1953                  * We must not set ->data_ready before we wait on the
1954                  * condition because the main thread may have set it to 1
1955                  * before we get here. In order to be sure that new
1956                  * work is available if we see 1 in ->data_ready, it
1957                  * was initialized to 0 before this thread was spawned
1958                  * and we reset it to 0 right away.
1959                  */
1960                 pthread_mutex_lock(&me->mutex);
1961                 while (!me->data_ready)
1962                         pthread_cond_wait(&me->cond, &me->mutex);
1963                 me->data_ready = 0;
1964                 pthread_mutex_unlock(&me->mutex);
1965         }
1966         /* leave ->working 1 so that this doesn't get more work assigned */
1967         return NULL;
1968 }
1969
1970 static void ll_find_deltas(struct object_entry **list, unsigned list_size,
1971                            int window, int depth, unsigned *processed)
1972 {
1973         struct thread_params *p;
1974         int i, ret, active_threads = 0;
1975
1976         init_threaded_search();
1977
1978         if (!delta_search_threads)      /* --threads=0 means autodetect */
1979                 delta_search_threads = online_cpus();
1980         if (delta_search_threads <= 1) {
1981                 find_deltas(list, &list_size, window, depth, processed);
1982                 cleanup_threaded_search();
1983                 return;
1984         }
1985         if (progress > pack_to_stdout)
1986                 fprintf(stderr, "Delta compression using up to %d threads.\n",
1987                                 delta_search_threads);
1988         p = xcalloc(delta_search_threads, sizeof(*p));
1989
1990         /* Partition the work amongst work threads. */
1991         for (i = 0; i < delta_search_threads; i++) {
1992                 unsigned sub_size = list_size / (delta_search_threads - i);
1993
1994                 /* don't use too small segments or no deltas will be found */
1995                 if (sub_size < 2*window && i+1 < delta_search_threads)
1996                         sub_size = 0;
1997
1998                 p[i].window = window;
1999                 p[i].depth = depth;
2000                 p[i].processed = processed;
2001                 p[i].working = 1;
2002                 p[i].data_ready = 0;
2003
2004                 /* try to split chunks on "path" boundaries */
2005                 while (sub_size && sub_size < list_size &&
2006                        list[sub_size]->hash &&
2007                        list[sub_size]->hash == list[sub_size-1]->hash)
2008                         sub_size++;
2009
2010                 p[i].list = list;
2011                 p[i].list_size = sub_size;
2012                 p[i].remaining = sub_size;
2013
2014                 list += sub_size;
2015                 list_size -= sub_size;
2016         }
2017
2018         /* Start work threads. */
2019         for (i = 0; i < delta_search_threads; i++) {
2020                 if (!p[i].list_size)
2021                         continue;
2022                 pthread_mutex_init(&p[i].mutex, NULL);
2023                 pthread_cond_init(&p[i].cond, NULL);
2024                 ret = pthread_create(&p[i].thread, NULL,
2025                                      threaded_find_deltas, &p[i]);
2026                 if (ret)
2027                         die("unable to create thread: %s", strerror(ret));
2028                 active_threads++;
2029         }
2030
2031         /*
2032          * Now let's wait for work completion.  Each time a thread is done
2033          * with its work, we steal half of the remaining work from the
2034          * thread with the largest number of unprocessed objects and give
2035          * it to that newly idle thread.  This ensure good load balancing
2036          * until the remaining object list segments are simply too short
2037          * to be worth splitting anymore.
2038          */
2039         while (active_threads) {
2040                 struct thread_params *target = NULL;
2041                 struct thread_params *victim = NULL;
2042                 unsigned sub_size = 0;
2043
2044                 progress_lock();
2045                 for (;;) {
2046                         for (i = 0; !target && i < delta_search_threads; i++)
2047                                 if (!p[i].working)
2048                                         target = &p[i];
2049                         if (target)
2050                                 break;
2051                         pthread_cond_wait(&progress_cond, &progress_mutex);
2052                 }
2053
2054                 for (i = 0; i < delta_search_threads; i++)
2055                         if (p[i].remaining > 2*window &&
2056                             (!victim || victim->remaining < p[i].remaining))
2057                                 victim = &p[i];
2058                 if (victim) {
2059                         sub_size = victim->remaining / 2;
2060                         list = victim->list + victim->list_size - sub_size;
2061                         while (sub_size && list[0]->hash &&
2062                                list[0]->hash == list[-1]->hash) {
2063                                 list++;
2064                                 sub_size--;
2065                         }
2066                         if (!sub_size) {
2067                                 /*
2068                                  * It is possible for some "paths" to have
2069                                  * so many objects that no hash boundary
2070                                  * might be found.  Let's just steal the
2071                                  * exact half in that case.
2072                                  */
2073                                 sub_size = victim->remaining / 2;
2074                                 list -= sub_size;
2075                         }
2076                         target->list = list;
2077                         victim->list_size -= sub_size;
2078                         victim->remaining -= sub_size;
2079                 }
2080                 target->list_size = sub_size;
2081                 target->remaining = sub_size;
2082                 target->working = 1;
2083                 progress_unlock();
2084
2085                 pthread_mutex_lock(&target->mutex);
2086                 target->data_ready = 1;
2087                 pthread_cond_signal(&target->cond);
2088                 pthread_mutex_unlock(&target->mutex);
2089
2090                 if (!sub_size) {
2091                         pthread_join(target->thread, NULL);
2092                         pthread_cond_destroy(&target->cond);
2093                         pthread_mutex_destroy(&target->mutex);
2094                         active_threads--;
2095                 }
2096         }
2097         cleanup_threaded_search();
2098         free(p);
2099 }
2100
2101 #else
2102 #define ll_find_deltas(l, s, w, d, p)   find_deltas(l, &s, w, d, p)
2103 #endif
2104
2105 static int add_ref_tag(const char *path, const unsigned char *sha1, int flag, void *cb_data)
2106 {
2107         unsigned char peeled[20];
2108
2109         if (starts_with(path, "refs/tags/") && /* is a tag? */
2110             !peel_ref(path, peeled)        && /* peelable? */
2111             packlist_find(&to_pack, peeled, NULL))      /* object packed? */
2112                 add_object_entry(sha1, OBJ_TAG, NULL, 0);
2113         return 0;
2114 }
2115
2116 static void prepare_pack(int window, int depth)
2117 {
2118         struct object_entry **delta_list;
2119         uint32_t i, nr_deltas;
2120         unsigned n;
2121
2122         get_object_details();
2123
2124         /*
2125          * If we're locally repacking then we need to be doubly careful
2126          * from now on in order to make sure no stealth corruption gets
2127          * propagated to the new pack.  Clients receiving streamed packs
2128          * should validate everything they get anyway so no need to incur
2129          * the additional cost here in that case.
2130          */
2131         if (!pack_to_stdout)
2132                 do_check_packed_object_crc = 1;
2133
2134         if (!to_pack.nr_objects || !window || !depth)
2135                 return;
2136
2137         delta_list = xmalloc(to_pack.nr_objects * sizeof(*delta_list));
2138         nr_deltas = n = 0;
2139
2140         for (i = 0; i < to_pack.nr_objects; i++) {
2141                 struct object_entry *entry = to_pack.objects + i;
2142
2143                 if (entry->delta)
2144                         /* This happens if we decided to reuse existing
2145                          * delta from a pack.  "reuse_delta &&" is implied.
2146                          */
2147                         continue;
2148
2149                 if (entry->size < 50)
2150                         continue;
2151
2152                 if (entry->no_try_delta)
2153                         continue;
2154
2155                 if (!entry->preferred_base) {
2156                         nr_deltas++;
2157                         if (entry->type < 0)
2158                                 die("unable to get type of object %s",
2159                                     sha1_to_hex(entry->idx.sha1));
2160                 } else {
2161                         if (entry->type < 0) {
2162                                 /*
2163                                  * This object is not found, but we
2164                                  * don't have to include it anyway.
2165                                  */
2166                                 continue;
2167                         }
2168                 }
2169
2170                 delta_list[n++] = entry;
2171         }
2172
2173         if (nr_deltas && n > 1) {
2174                 unsigned nr_done = 0;
2175                 if (progress)
2176                         progress_state = start_progress(_("Compressing objects"),
2177                                                         nr_deltas);
2178                 qsort(delta_list, n, sizeof(*delta_list), type_size_sort);
2179                 ll_find_deltas(delta_list, n, window+1, depth, &nr_done);
2180                 stop_progress(&progress_state);
2181                 if (nr_done != nr_deltas)
2182                         die("inconsistency with delta count");
2183         }
2184         free(delta_list);
2185 }
2186
2187 static int git_pack_config(const char *k, const char *v, void *cb)
2188 {
2189         if (!strcmp(k, "pack.window")) {
2190                 window = git_config_int(k, v);
2191                 return 0;
2192         }
2193         if (!strcmp(k, "pack.windowmemory")) {
2194                 window_memory_limit = git_config_ulong(k, v);
2195                 return 0;
2196         }
2197         if (!strcmp(k, "pack.depth")) {
2198                 depth = git_config_int(k, v);
2199                 return 0;
2200         }
2201         if (!strcmp(k, "pack.compression")) {
2202                 int level = git_config_int(k, v);
2203                 if (level == -1)
2204                         level = Z_DEFAULT_COMPRESSION;
2205                 else if (level < 0 || level > Z_BEST_COMPRESSION)
2206                         die("bad pack compression level %d", level);
2207                 pack_compression_level = level;
2208                 pack_compression_seen = 1;
2209                 return 0;
2210         }
2211         if (!strcmp(k, "pack.deltacachesize")) {
2212                 max_delta_cache_size = git_config_int(k, v);
2213                 return 0;
2214         }
2215         if (!strcmp(k, "pack.deltacachelimit")) {
2216                 cache_max_small_delta_size = git_config_int(k, v);
2217                 return 0;
2218         }
2219         if (!strcmp(k, "pack.writebitmaphashcache")) {
2220                 if (git_config_bool(k, v))
2221                         write_bitmap_options |= BITMAP_OPT_HASH_CACHE;
2222                 else
2223                         write_bitmap_options &= ~BITMAP_OPT_HASH_CACHE;
2224         }
2225         if (!strcmp(k, "pack.usebitmaps")) {
2226                 use_bitmap_index = git_config_bool(k, v);
2227                 return 0;
2228         }
2229         if (!strcmp(k, "pack.threads")) {
2230                 delta_search_threads = git_config_int(k, v);
2231                 if (delta_search_threads < 0)
2232                         die("invalid number of threads specified (%d)",
2233                             delta_search_threads);
2234 #ifdef NO_PTHREADS
2235                 if (delta_search_threads != 1)
2236                         warning("no threads support, ignoring %s", k);
2237 #endif
2238                 return 0;
2239         }
2240         if (!strcmp(k, "pack.indexversion")) {
2241                 pack_idx_opts.version = git_config_int(k, v);
2242                 if (pack_idx_opts.version > 2)
2243                         die("bad pack.indexversion=%"PRIu32,
2244                             pack_idx_opts.version);
2245                 return 0;
2246         }
2247         return git_default_config(k, v, cb);
2248 }
2249
2250 static void read_object_list_from_stdin(void)
2251 {
2252         char line[40 + 1 + PATH_MAX + 2];
2253         unsigned char sha1[20];
2254
2255         for (;;) {
2256                 if (!fgets(line, sizeof(line), stdin)) {
2257                         if (feof(stdin))
2258                                 break;
2259                         if (!ferror(stdin))
2260                                 die("fgets returned NULL, not EOF, not error!");
2261                         if (errno != EINTR)
2262                                 die_errno("fgets");
2263                         clearerr(stdin);
2264                         continue;
2265                 }
2266                 if (line[0] == '-') {
2267                         if (get_sha1_hex(line+1, sha1))
2268                                 die("expected edge sha1, got garbage:\n %s",
2269                                     line);
2270                         add_preferred_base(sha1);
2271                         continue;
2272                 }
2273                 if (get_sha1_hex(line, sha1))
2274                         die("expected sha1, got garbage:\n %s", line);
2275
2276                 add_preferred_base_object(line+41);
2277                 add_object_entry(sha1, 0, line+41, 0);
2278         }
2279 }
2280
2281 #define OBJECT_ADDED (1u<<20)
2282
2283 static void show_commit(struct commit *commit, void *data)
2284 {
2285         add_object_entry(commit->object.sha1, OBJ_COMMIT, NULL, 0);
2286         commit->object.flags |= OBJECT_ADDED;
2287
2288         if (write_bitmap_index)
2289                 index_commit_for_bitmap(commit);
2290 }
2291
2292 static void show_object(struct object *obj,
2293                         const struct name_path *path, const char *last,
2294                         void *data)
2295 {
2296         char *name = path_name(path, last);
2297
2298         add_preferred_base_object(name);
2299         add_object_entry(obj->sha1, obj->type, name, 0);
2300         obj->flags |= OBJECT_ADDED;
2301
2302         /*
2303          * We will have generated the hash from the name,
2304          * but not saved a pointer to it - we can free it
2305          */
2306         free((char *)name);
2307 }
2308
2309 static void show_edge(struct commit *commit)
2310 {
2311         add_preferred_base(commit->object.sha1);
2312 }
2313
2314 struct in_pack_object {
2315         off_t offset;
2316         struct object *object;
2317 };
2318
2319 struct in_pack {
2320         int alloc;
2321         int nr;
2322         struct in_pack_object *array;
2323 };
2324
2325 static void mark_in_pack_object(struct object *object, struct packed_git *p, struct in_pack *in_pack)
2326 {
2327         in_pack->array[in_pack->nr].offset = find_pack_entry_one(object->sha1, p);
2328         in_pack->array[in_pack->nr].object = object;
2329         in_pack->nr++;
2330 }
2331
2332 /*
2333  * Compare the objects in the offset order, in order to emulate the
2334  * "git rev-list --objects" output that produced the pack originally.
2335  */
2336 static int ofscmp(const void *a_, const void *b_)
2337 {
2338         struct in_pack_object *a = (struct in_pack_object *)a_;
2339         struct in_pack_object *b = (struct in_pack_object *)b_;
2340
2341         if (a->offset < b->offset)
2342                 return -1;
2343         else if (a->offset > b->offset)
2344                 return 1;
2345         else
2346                 return hashcmp(a->object->sha1, b->object->sha1);
2347 }
2348
2349 static void add_objects_in_unpacked_packs(struct rev_info *revs)
2350 {
2351         struct packed_git *p;
2352         struct in_pack in_pack;
2353         uint32_t i;
2354
2355         memset(&in_pack, 0, sizeof(in_pack));
2356
2357         for (p = packed_git; p; p = p->next) {
2358                 const unsigned char *sha1;
2359                 struct object *o;
2360
2361                 if (!p->pack_local || p->pack_keep)
2362                         continue;
2363                 if (open_pack_index(p))
2364                         die("cannot open pack index");
2365
2366                 ALLOC_GROW(in_pack.array,
2367                            in_pack.nr + p->num_objects,
2368                            in_pack.alloc);
2369
2370                 for (i = 0; i < p->num_objects; i++) {
2371                         sha1 = nth_packed_object_sha1(p, i);
2372                         o = lookup_unknown_object(sha1);
2373                         if (!(o->flags & OBJECT_ADDED))
2374                                 mark_in_pack_object(o, p, &in_pack);
2375                         o->flags |= OBJECT_ADDED;
2376                 }
2377         }
2378
2379         if (in_pack.nr) {
2380                 qsort(in_pack.array, in_pack.nr, sizeof(in_pack.array[0]),
2381                       ofscmp);
2382                 for (i = 0; i < in_pack.nr; i++) {
2383                         struct object *o = in_pack.array[i].object;
2384                         add_object_entry(o->sha1, o->type, "", 0);
2385                 }
2386         }
2387         free(in_pack.array);
2388 }
2389
2390 static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
2391 {
2392         static struct packed_git *last_found = (void *)1;
2393         struct packed_git *p;
2394
2395         p = (last_found != (void *)1) ? last_found : packed_git;
2396
2397         while (p) {
2398                 if ((!p->pack_local || p->pack_keep) &&
2399                         find_pack_entry_one(sha1, p)) {
2400                         last_found = p;
2401                         return 1;
2402                 }
2403                 if (p == last_found)
2404                         p = packed_git;
2405                 else
2406                         p = p->next;
2407                 if (p == last_found)
2408                         p = p->next;
2409         }
2410         return 0;
2411 }
2412
2413 /*
2414  * Store a list of sha1s that are should not be discarded
2415  * because they are either written too recently, or are
2416  * reachable from another object that was.
2417  *
2418  * This is filled by get_object_list.
2419  */
2420 static struct sha1_array recent_objects;
2421
2422 static int loosened_object_can_be_discarded(const unsigned char *sha1,
2423                                             unsigned long mtime)
2424 {
2425         if (!unpack_unreachable_expiration)
2426                 return 0;
2427         if (mtime > unpack_unreachable_expiration)
2428                 return 0;
2429         if (sha1_array_lookup(&recent_objects, sha1) >= 0)
2430                 return 0;
2431         return 1;
2432 }
2433
2434 static void loosen_unused_packed_objects(struct rev_info *revs)
2435 {
2436         struct packed_git *p;
2437         uint32_t i;
2438         const unsigned char *sha1;
2439
2440         for (p = packed_git; p; p = p->next) {
2441                 if (!p->pack_local || p->pack_keep)
2442                         continue;
2443
2444                 if (open_pack_index(p))
2445                         die("cannot open pack index");
2446
2447                 for (i = 0; i < p->num_objects; i++) {
2448                         sha1 = nth_packed_object_sha1(p, i);
2449                         if (!packlist_find(&to_pack, sha1, NULL) &&
2450                             !has_sha1_pack_kept_or_nonlocal(sha1) &&
2451                             !loosened_object_can_be_discarded(sha1, p->mtime))
2452                                 if (force_object_loose(sha1, p->mtime))
2453                                         die("unable to force loose object");
2454                 }
2455         }
2456 }
2457
2458 /*
2459  * This tracks any options which a reader of the pack might
2460  * not understand, and which would therefore prevent blind reuse
2461  * of what we have on disk.
2462  */
2463 static int pack_options_allow_reuse(void)
2464 {
2465         return allow_ofs_delta;
2466 }
2467
2468 static int get_object_list_from_bitmap(struct rev_info *revs)
2469 {
2470         if (prepare_bitmap_walk(revs) < 0)
2471                 return -1;
2472
2473         if (pack_options_allow_reuse() &&
2474             !reuse_partial_packfile_from_bitmap(
2475                         &reuse_packfile,
2476                         &reuse_packfile_objects,
2477                         &reuse_packfile_offset)) {
2478                 assert(reuse_packfile_objects);
2479                 nr_result += reuse_packfile_objects;
2480                 display_progress(progress_state, nr_result);
2481         }
2482
2483         traverse_bitmap_commit_list(&add_object_entry_from_bitmap);
2484         return 0;
2485 }
2486
2487 static void record_recent_object(struct object *obj,
2488                                  const struct name_path *path,
2489                                  const char *last,
2490                                  void *data)
2491 {
2492         sha1_array_append(&recent_objects, obj->sha1);
2493 }
2494
2495 static void record_recent_commit(struct commit *commit, void *data)
2496 {
2497         sha1_array_append(&recent_objects, commit->object.sha1);
2498 }
2499
2500 static void get_object_list(int ac, const char **av)
2501 {
2502         struct rev_info revs;
2503         char line[1000];
2504         int flags = 0;
2505
2506         init_revisions(&revs, NULL);
2507         save_commit_buffer = 0;
2508         setup_revisions(ac, av, &revs, NULL);
2509
2510         /* make sure shallows are read */
2511         is_repository_shallow();
2512
2513         while (fgets(line, sizeof(line), stdin) != NULL) {
2514                 int len = strlen(line);
2515                 if (len && line[len - 1] == '\n')
2516                         line[--len] = 0;
2517                 if (!len)
2518                         break;
2519                 if (*line == '-') {
2520                         if (!strcmp(line, "--not")) {
2521                                 flags ^= UNINTERESTING;
2522                                 write_bitmap_index = 0;
2523                                 continue;
2524                         }
2525                         if (starts_with(line, "--shallow ")) {
2526                                 unsigned char sha1[20];
2527                                 if (get_sha1_hex(line + 10, sha1))
2528                                         die("not an SHA-1 '%s'", line + 10);
2529                                 register_shallow(sha1);
2530                                 use_bitmap_index = 0;
2531                                 continue;
2532                         }
2533                         die("not a rev '%s'", line);
2534                 }
2535                 if (handle_revision_arg(line, &revs, flags, REVARG_CANNOT_BE_FILENAME))
2536                         die("bad revision '%s'", line);
2537         }
2538
2539         if (use_bitmap_index && !get_object_list_from_bitmap(&revs))
2540                 return;
2541
2542         if (prepare_revision_walk(&revs))
2543                 die("revision walk setup failed");
2544         mark_edges_uninteresting(&revs, show_edge);
2545         traverse_commit_list(&revs, show_commit, show_object, NULL);
2546
2547         if (unpack_unreachable_expiration) {
2548                 revs.ignore_missing_links = 1;
2549                 if (add_unseen_recent_objects_to_traversal(&revs,
2550                                 unpack_unreachable_expiration))
2551                         die("unable to add recent objects");
2552                 if (prepare_revision_walk(&revs))
2553                         die("revision walk setup failed");
2554                 traverse_commit_list(&revs, record_recent_commit,
2555                                      record_recent_object, NULL);
2556         }
2557
2558         if (keep_unreachable)
2559                 add_objects_in_unpacked_packs(&revs);
2560         if (unpack_unreachable)
2561                 loosen_unused_packed_objects(&revs);
2562
2563         sha1_array_clear(&recent_objects);
2564 }
2565
2566 static int option_parse_index_version(const struct option *opt,
2567                                       const char *arg, int unset)
2568 {
2569         char *c;
2570         const char *val = arg;
2571         pack_idx_opts.version = strtoul(val, &c, 10);
2572         if (pack_idx_opts.version > 2)
2573                 die(_("unsupported index version %s"), val);
2574         if (*c == ',' && c[1])
2575                 pack_idx_opts.off32_limit = strtoul(c+1, &c, 0);
2576         if (*c || pack_idx_opts.off32_limit & 0x80000000)
2577                 die(_("bad index version '%s'"), val);
2578         return 0;
2579 }
2580
2581 static int option_parse_unpack_unreachable(const struct option *opt,
2582                                            const char *arg, int unset)
2583 {
2584         if (unset) {
2585                 unpack_unreachable = 0;
2586                 unpack_unreachable_expiration = 0;
2587         }
2588         else {
2589                 unpack_unreachable = 1;
2590                 if (arg)
2591                         unpack_unreachable_expiration = approxidate(arg);
2592         }
2593         return 0;
2594 }
2595
2596 static int option_parse_ulong(const struct option *opt,
2597                               const char *arg, int unset)
2598 {
2599         if (unset)
2600                 die(_("option %s does not accept negative form"),
2601                     opt->long_name);
2602
2603         if (!git_parse_ulong(arg, opt->value))
2604                 die(_("unable to parse value '%s' for option %s"),
2605                     arg, opt->long_name);
2606         return 0;
2607 }
2608
2609 #define OPT_ULONG(s, l, v, h) \
2610         { OPTION_CALLBACK, (s), (l), (v), "n", (h),     \
2611           PARSE_OPT_NONEG, option_parse_ulong }
2612
2613 int cmd_pack_objects(int argc, const char **argv, const char *prefix)
2614 {
2615         int use_internal_rev_list = 0;
2616         int thin = 0;
2617         int all_progress_implied = 0;
2618         struct argv_array rp = ARGV_ARRAY_INIT;
2619         int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
2620         int rev_list_index = 0;
2621         struct option pack_objects_options[] = {
2622                 OPT_SET_INT('q', "quiet", &progress,
2623                             N_("do not show progress meter"), 0),
2624                 OPT_SET_INT(0, "progress", &progress,
2625                             N_("show progress meter"), 1),
2626                 OPT_SET_INT(0, "all-progress", &progress,
2627                             N_("show progress meter during object writing phase"), 2),
2628                 OPT_BOOL(0, "all-progress-implied",
2629                          &all_progress_implied,
2630                          N_("similar to --all-progress when progress meter is shown")),
2631                 { OPTION_CALLBACK, 0, "index-version", NULL, N_("version[,offset]"),
2632                   N_("write the pack index file in the specified idx format version"),
2633                   0, option_parse_index_version },
2634                 OPT_ULONG(0, "max-pack-size", &pack_size_limit,
2635                           N_("maximum size of each output pack file")),
2636                 OPT_BOOL(0, "local", &local,
2637                          N_("ignore borrowed objects from alternate object store")),
2638                 OPT_BOOL(0, "incremental", &incremental,
2639                          N_("ignore packed objects")),
2640                 OPT_INTEGER(0, "window", &window,
2641                             N_("limit pack window by objects")),
2642                 OPT_ULONG(0, "window-memory", &window_memory_limit,
2643                           N_("limit pack window by memory in addition to object limit")),
2644                 OPT_INTEGER(0, "depth", &depth,
2645                             N_("maximum length of delta chain allowed in the resulting pack")),
2646                 OPT_BOOL(0, "reuse-delta", &reuse_delta,
2647                          N_("reuse existing deltas")),
2648                 OPT_BOOL(0, "reuse-object", &reuse_object,
2649                          N_("reuse existing objects")),
2650                 OPT_BOOL(0, "delta-base-offset", &allow_ofs_delta,
2651                          N_("use OFS_DELTA objects")),
2652                 OPT_INTEGER(0, "threads", &delta_search_threads,
2653                             N_("use threads when searching for best delta matches")),
2654                 OPT_BOOL(0, "non-empty", &non_empty,
2655                          N_("do not create an empty pack output")),
2656                 OPT_BOOL(0, "revs", &use_internal_rev_list,
2657                          N_("read revision arguments from standard input")),
2658                 { OPTION_SET_INT, 0, "unpacked", &rev_list_unpacked, NULL,
2659                   N_("limit the objects to those that are not yet packed"),
2660                   PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2661                 { OPTION_SET_INT, 0, "all", &rev_list_all, NULL,
2662                   N_("include objects reachable from any reference"),
2663                   PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2664                 { OPTION_SET_INT, 0, "reflog", &rev_list_reflog, NULL,
2665                   N_("include objects referred by reflog entries"),
2666                   PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2667                 { OPTION_SET_INT, 0, "indexed-objects", &rev_list_index, NULL,
2668                   N_("include objects referred to by the index"),
2669                   PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, 1 },
2670                 OPT_BOOL(0, "stdout", &pack_to_stdout,
2671                          N_("output pack to stdout")),
2672                 OPT_BOOL(0, "include-tag", &include_tag,
2673                          N_("include tag objects that refer to objects to be packed")),
2674                 OPT_BOOL(0, "keep-unreachable", &keep_unreachable,
2675                          N_("keep unreachable objects")),
2676                 { OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
2677                   N_("unpack unreachable objects newer than <time>"),
2678                   PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
2679                 OPT_BOOL(0, "thin", &thin,
2680                          N_("create thin packs")),
2681                 OPT_BOOL(0, "honor-pack-keep", &ignore_packed_keep,
2682                          N_("ignore packs that have companion .keep file")),
2683                 OPT_INTEGER(0, "compression", &pack_compression_level,
2684                             N_("pack compression level")),
2685                 OPT_SET_INT(0, "keep-true-parents", &grafts_replace_parents,
2686                             N_("do not hide commits by grafts"), 0),
2687                 OPT_BOOL(0, "use-bitmap-index", &use_bitmap_index,
2688                          N_("use a bitmap index if available to speed up counting objects")),
2689                 OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
2690                          N_("write a bitmap index together with the pack index")),
2691                 OPT_END(),
2692         };
2693
2694         check_replace_refs = 0;
2695
2696         reset_pack_idx_option(&pack_idx_opts);
2697         git_config(git_pack_config, NULL);
2698         if (!pack_compression_seen && core_compression_seen)
2699                 pack_compression_level = core_compression_level;
2700
2701         progress = isatty(2);
2702         argc = parse_options(argc, argv, prefix, pack_objects_options,
2703                              pack_usage, 0);
2704
2705         if (argc) {
2706                 base_name = argv[0];
2707                 argc--;
2708         }
2709         if (pack_to_stdout != !base_name || argc)
2710                 usage_with_options(pack_usage, pack_objects_options);
2711
2712         argv_array_push(&rp, "pack-objects");
2713         if (thin) {
2714                 use_internal_rev_list = 1;
2715                 argv_array_push(&rp, "--objects-edge");
2716         } else
2717                 argv_array_push(&rp, "--objects");
2718
2719         if (rev_list_all) {
2720                 use_internal_rev_list = 1;
2721                 argv_array_push(&rp, "--all");
2722         }
2723         if (rev_list_reflog) {
2724                 use_internal_rev_list = 1;
2725                 argv_array_push(&rp, "--reflog");
2726         }
2727         if (rev_list_index) {
2728                 use_internal_rev_list = 1;
2729                 argv_array_push(&rp, "--indexed-objects");
2730         }
2731         if (rev_list_unpacked) {
2732                 use_internal_rev_list = 1;
2733                 argv_array_push(&rp, "--unpacked");
2734         }
2735
2736         if (!reuse_object)
2737                 reuse_delta = 0;
2738         if (pack_compression_level == -1)
2739                 pack_compression_level = Z_DEFAULT_COMPRESSION;
2740         else if (pack_compression_level < 0 || pack_compression_level > Z_BEST_COMPRESSION)
2741                 die("bad pack compression level %d", pack_compression_level);
2742 #ifdef NO_PTHREADS
2743         if (delta_search_threads != 1)
2744                 warning("no threads support, ignoring --threads");
2745 #endif
2746         if (!pack_to_stdout && !pack_size_limit)
2747                 pack_size_limit = pack_size_limit_cfg;
2748         if (pack_to_stdout && pack_size_limit)
2749                 die("--max-pack-size cannot be used to build a pack for transfer.");
2750         if (pack_size_limit && pack_size_limit < 1024*1024) {
2751                 warning("minimum pack size limit is 1 MiB");
2752                 pack_size_limit = 1024*1024;
2753         }
2754
2755         if (!pack_to_stdout && thin)
2756                 die("--thin cannot be used to build an indexable pack.");
2757
2758         if (keep_unreachable && unpack_unreachable)
2759                 die("--keep-unreachable and --unpack-unreachable are incompatible.");
2760         if (!rev_list_all || !rev_list_reflog || !rev_list_index)
2761                 unpack_unreachable_expiration = 0;
2762
2763         if (!use_internal_rev_list || !pack_to_stdout || is_repository_shallow())
2764                 use_bitmap_index = 0;
2765
2766         if (pack_to_stdout || !rev_list_all)
2767                 write_bitmap_index = 0;
2768
2769         if (progress && all_progress_implied)
2770                 progress = 2;
2771
2772         prepare_packed_git();
2773
2774         if (progress)
2775                 progress_state = start_progress(_("Counting objects"), 0);
2776         if (!use_internal_rev_list)
2777                 read_object_list_from_stdin();
2778         else {
2779                 get_object_list(rp.argc, rp.argv);
2780                 argv_array_clear(&rp);
2781         }
2782         cleanup_preferred_base();
2783         if (include_tag && nr_result)
2784                 for_each_ref(add_ref_tag, NULL);
2785         stop_progress(&progress_state);
2786
2787         if (non_empty && !nr_result)
2788                 return 0;
2789         if (nr_result)
2790                 prepare_pack(window, depth);
2791         write_pack_file();
2792         if (progress)
2793                 fprintf(stderr, "Total %"PRIu32" (delta %"PRIu32"),"
2794                         " reused %"PRIu32" (delta %"PRIu32")\n",
2795                         written, written_delta, reused, reused_delta);
2796         return 0;
2797 }