git

1
#include "builtin.h"
2
#include "config.h"
3
#include "dir.h"
4
#include "environment.h"
5
#include "gettext.h"
6
#include "hex.h"
7
#include "parse-options.h"
8
#include "path.h"
9
#include "run-command.h"
10
#include "server-info.h"
11
#include "strbuf.h"
12
#include "string-list.h"
13
#include "strvec.h"
14
#include "midx.h"
15
#include "packfile.h"
16
#include "prune-packed.h"
17
#include "object-store-ll.h"
18
#include "promisor-remote.h"
19
#include "shallow.h"
20
#include "pack.h"
21
#include "pack-bitmap.h"
22
#include "refs.h"
23
#include "list-objects-filter-options.h"
24

25
#define ALL_INTO_ONE 1
26
#define LOOSEN_UNREACHABLE 2
27
#define PACK_CRUFT 4
28

29
#define DELETE_PACK 1
30
#define RETAIN_PACK 2
31

32
static int pack_everything;
33
static int delta_base_offset = 1;
34
static int pack_kept_objects = -1;
35
static int write_bitmaps = -1;
36
static int use_delta_islands;
37
static int run_update_server_info = 1;
38
static char *packdir, *packtmp_name, *packtmp;
39

40
static const char *const git_repack_usage[] = {
41
	N_("git repack [<options>]"),
42
	NULL
43
};
44

45
static const char incremental_bitmap_conflict_error[] = N_(
46
"Incremental repacks are incompatible with bitmap indexes.  Use\n"
47
"--no-write-bitmap-index or disable the pack.writeBitmaps configuration."
48
);
49

50
struct pack_objects_args {
51
	char *window;
52
	char *window_memory;
53
	char *depth;
54
	char *threads;
55
	unsigned long max_pack_size;
56
	int no_reuse_delta;
57
	int no_reuse_object;
58
	int quiet;
59
	int local;
60
	struct list_objects_filter_options filter_options;
61
};
62

63
static int repack_config(const char *var, const char *value,
64
			 const struct config_context *ctx, void *cb)
65
{
66
	struct pack_objects_args *cruft_po_args = cb;
67
	if (!strcmp(var, "repack.usedeltabaseoffset")) {
68
		delta_base_offset = git_config_bool(var, value);
69
		return 0;
70
	}
71
	if (!strcmp(var, "repack.packkeptobjects")) {
72
		pack_kept_objects = git_config_bool(var, value);
73
		return 0;
74
	}
75
	if (!strcmp(var, "repack.writebitmaps") ||
76
	    !strcmp(var, "pack.writebitmaps")) {
77
		write_bitmaps = git_config_bool(var, value);
78
		return 0;
79
	}
80
	if (!strcmp(var, "repack.usedeltaislands")) {
81
		use_delta_islands = git_config_bool(var, value);
82
		return 0;
83
	}
84
	if (strcmp(var, "repack.updateserverinfo") == 0) {
85
		run_update_server_info = git_config_bool(var, value);
86
		return 0;
87
	}
88
	if (!strcmp(var, "repack.cruftwindow"))
89
		return git_config_string(&cruft_po_args->window, var, value);
90
	if (!strcmp(var, "repack.cruftwindowmemory"))
91
		return git_config_string(&cruft_po_args->window_memory, var, value);
92
	if (!strcmp(var, "repack.cruftdepth"))
93
		return git_config_string(&cruft_po_args->depth, var, value);
94
	if (!strcmp(var, "repack.cruftthreads"))
95
		return git_config_string(&cruft_po_args->threads, var, value);
96
	return git_default_config(var, value, ctx, cb);
97
}
98

99
struct existing_packs {
100
	struct string_list kept_packs;
101
	struct string_list non_kept_packs;
102
	struct string_list cruft_packs;
103
};
104

105
#define EXISTING_PACKS_INIT { \
106
	.kept_packs = STRING_LIST_INIT_DUP, \
107
	.non_kept_packs = STRING_LIST_INIT_DUP, \
108
	.cruft_packs = STRING_LIST_INIT_DUP, \
109
}
110

111
static int has_existing_non_kept_packs(const struct existing_packs *existing)
112
{
113
	return existing->non_kept_packs.nr || existing->cruft_packs.nr;
114
}
115

116
static void pack_mark_for_deletion(struct string_list_item *item)
117
{
118
	item->util = (void*)((uintptr_t)item->util | DELETE_PACK);
119
}
120

121
static void pack_unmark_for_deletion(struct string_list_item *item)
122
{
123
	item->util = (void*)((uintptr_t)item->util & ~DELETE_PACK);
124
}
125

126
static int pack_is_marked_for_deletion(struct string_list_item *item)
127
{
128
	return (uintptr_t)item->util & DELETE_PACK;
129
}
130

131
static void pack_mark_retained(struct string_list_item *item)
132
{
133
	item->util = (void*)((uintptr_t)item->util | RETAIN_PACK);
134
}
135

136
static int pack_is_retained(struct string_list_item *item)
137
{
138
	return (uintptr_t)item->util & RETAIN_PACK;
139
}
140

141
static void mark_packs_for_deletion_1(struct string_list *names,
142
				      struct string_list *list)
143
{
144
	struct string_list_item *item;
145
	const int hexsz = the_hash_algo->hexsz;
146

147
	for_each_string_list_item(item, list) {
148
		char *sha1;
149
		size_t len = strlen(item->string);
150
		if (len < hexsz)
151
			continue;
152
		sha1 = item->string + len - hexsz;
153

154
		if (pack_is_retained(item)) {
155
			pack_unmark_for_deletion(item);
156
		} else if (!string_list_has_string(names, sha1)) {
157
			/*
158
			 * Mark this pack for deletion, which ensures
159
			 * that this pack won't be included in a MIDX
160
			 * (if `--write-midx` was given) and that we
161
			 * will actually delete this pack (if `-d` was
162
			 * given).
163
			 */
164
			pack_mark_for_deletion(item);
165
		}
166
	}
167
}
168

169
static void retain_cruft_pack(struct existing_packs *existing,
170
			      struct packed_git *cruft)
171
{
172
	struct strbuf buf = STRBUF_INIT;
173
	struct string_list_item *item;
174

175
	strbuf_addstr(&buf, pack_basename(cruft));
176
	strbuf_strip_suffix(&buf, ".pack");
177

178
	item = string_list_lookup(&existing->cruft_packs, buf.buf);
179
	if (!item)
180
		BUG("could not find cruft pack '%s'", pack_basename(cruft));
181

182
	pack_mark_retained(item);
183
	strbuf_release(&buf);
184
}
185

186
static void mark_packs_for_deletion(struct existing_packs *existing,
187
				    struct string_list *names)
188

189
{
190
	mark_packs_for_deletion_1(names, &existing->non_kept_packs);
191
	mark_packs_for_deletion_1(names, &existing->cruft_packs);
192
}
193

194
static void remove_redundant_pack(const char *dir_name, const char *base_name)
195
{
196
	struct strbuf buf = STRBUF_INIT;
197
	struct multi_pack_index *m = get_local_multi_pack_index(the_repository);
198
	strbuf_addf(&buf, "%s.pack", base_name);
199
	if (m && midx_contains_pack(m, buf.buf))
200
		clear_midx_file(the_repository);
201
	strbuf_insertf(&buf, 0, "%s/", dir_name);
202
	unlink_pack_path(buf.buf, 1);
203
	strbuf_release(&buf);
204
}
205

206
static void remove_redundant_packs_1(struct string_list *packs)
207
{
208
	struct string_list_item *item;
209
	for_each_string_list_item(item, packs) {
210
		if (!pack_is_marked_for_deletion(item))
211
			continue;
212
		remove_redundant_pack(packdir, item->string);
213
	}
214
}
215

216
static void remove_redundant_existing_packs(struct existing_packs *existing)
217
{
218
	remove_redundant_packs_1(&existing->non_kept_packs);
219
	remove_redundant_packs_1(&existing->cruft_packs);
220
}
221

222
static void existing_packs_release(struct existing_packs *existing)
223
{
224
	string_list_clear(&existing->kept_packs, 0);
225
	string_list_clear(&existing->non_kept_packs, 0);
226
	string_list_clear(&existing->cruft_packs, 0);
227
}
228

229
/*
230
 * Adds all packs hex strings (pack-$HASH) to either packs->non_kept
231
 * or packs->kept based on whether each pack has a corresponding
232
 * .keep file or not.  Packs without a .keep file are not to be kept
233
 * if we are going to pack everything into one file.
234
 */
235
static void collect_pack_filenames(struct existing_packs *existing,
236
				   const struct string_list *extra_keep)
237
{
238
	struct packed_git *p;
239
	struct strbuf buf = STRBUF_INIT;
240

241
	for (p = get_all_packs(the_repository); p; p = p->next) {
242
		int i;
243
		const char *base;
244

245
		if (!p->pack_local)
246
			continue;
247

248
		base = pack_basename(p);
249

250
		for (i = 0; i < extra_keep->nr; i++)
251
			if (!fspathcmp(base, extra_keep->items[i].string))
252
				break;
253

254
		strbuf_reset(&buf);
255
		strbuf_addstr(&buf, base);
256
		strbuf_strip_suffix(&buf, ".pack");
257

258
		if ((extra_keep->nr > 0 && i < extra_keep->nr) || p->pack_keep)
259
			string_list_append(&existing->kept_packs, buf.buf);
260
		else if (p->is_cruft)
261
			string_list_append(&existing->cruft_packs, buf.buf);
262
		else
263
			string_list_append(&existing->non_kept_packs, buf.buf);
264
	}
265

266
	string_list_sort(&existing->kept_packs);
267
	string_list_sort(&existing->non_kept_packs);
268
	string_list_sort(&existing->cruft_packs);
269
	strbuf_release(&buf);
270
}
271

272
static void prepare_pack_objects(struct child_process *cmd,
273
				 const struct pack_objects_args *args,
274
				 const char *out)
275
{
276
	strvec_push(&cmd->args, "pack-objects");
277
	if (args->window)
278
		strvec_pushf(&cmd->args, "--window=%s", args->window);
279
	if (args->window_memory)
280
		strvec_pushf(&cmd->args, "--window-memory=%s", args->window_memory);
281
	if (args->depth)
282
		strvec_pushf(&cmd->args, "--depth=%s", args->depth);
283
	if (args->threads)
284
		strvec_pushf(&cmd->args, "--threads=%s", args->threads);
285
	if (args->max_pack_size)
286
		strvec_pushf(&cmd->args, "--max-pack-size=%lu", args->max_pack_size);
287
	if (args->no_reuse_delta)
288
		strvec_pushf(&cmd->args, "--no-reuse-delta");
289
	if (args->no_reuse_object)
290
		strvec_pushf(&cmd->args, "--no-reuse-object");
291
	if (args->local)
292
		strvec_push(&cmd->args,  "--local");
293
	if (args->quiet)
294
		strvec_push(&cmd->args,  "--quiet");
295
	if (delta_base_offset)
296
		strvec_push(&cmd->args,  "--delta-base-offset");
297
	strvec_push(&cmd->args, out);
298
	cmd->git_cmd = 1;
299
	cmd->out = -1;
300
}
301

302
/*
303
 * Write oid to the given struct child_process's stdin, starting it first if
304
 * necessary.
305
 */
306
static int write_oid(const struct object_id *oid,
307
		     struct packed_git *pack UNUSED,
308
		     uint32_t pos UNUSED, void *data)
309
{
310
	struct child_process *cmd = data;
311

312
	if (cmd->in == -1) {
313
		if (start_command(cmd))
314
			die(_("could not start pack-objects to repack promisor objects"));
315
	}
316

317
	if (write_in_full(cmd->in, oid_to_hex(oid), the_hash_algo->hexsz) < 0 ||
318
	    write_in_full(cmd->in, "\n", 1) < 0)
319
		die(_("failed to feed promisor objects to pack-objects"));
320
	return 0;
321
}
322

323
static struct {
324
	const char *name;
325
	unsigned optional:1;
326
} exts[] = {
327
	{".pack"},
328
	{".rev", 1},
329
	{".mtimes", 1},
330
	{".bitmap", 1},
331
	{".promisor", 1},
332
	{".idx"},
333
};
334

335
struct generated_pack_data {
336
	struct tempfile *tempfiles[ARRAY_SIZE(exts)];
337
};
338

339
static struct generated_pack_data *populate_pack_exts(const char *name)
340
{
341
	struct stat statbuf;
342
	struct strbuf path = STRBUF_INIT;
343
	struct generated_pack_data *data = xcalloc(1, sizeof(*data));
344
	int i;
345

346
	for (i = 0; i < ARRAY_SIZE(exts); i++) {
347
		strbuf_reset(&path);
348
		strbuf_addf(&path, "%s-%s%s", packtmp, name, exts[i].name);
349

350
		if (stat(path.buf, &statbuf))
351
			continue;
352

353
		data->tempfiles[i] = register_tempfile(path.buf);
354
	}
355

356
	strbuf_release(&path);
357
	return data;
358
}
359

360
static int has_pack_ext(const struct generated_pack_data *data,
361
			const char *ext)
362
{
363
	int i;
364
	for (i = 0; i < ARRAY_SIZE(exts); i++) {
365
		if (strcmp(exts[i].name, ext))
366
			continue;
367
		return !!data->tempfiles[i];
368
	}
369
	BUG("unknown pack extension: '%s'", ext);
370
}
371

372
static void repack_promisor_objects(const struct pack_objects_args *args,
373
				    struct string_list *names)
374
{
375
	struct child_process cmd = CHILD_PROCESS_INIT;
376
	FILE *out;
377
	struct strbuf line = STRBUF_INIT;
378

379
	prepare_pack_objects(&cmd, args, packtmp);
380
	cmd.in = -1;
381

382
	/*
383
	 * NEEDSWORK: Giving pack-objects only the OIDs without any ordering
384
	 * hints may result in suboptimal deltas in the resulting pack. See if
385
	 * the OIDs can be sent with fake paths such that pack-objects can use a
386
	 * {type -> existing pack order} ordering when computing deltas instead
387
	 * of a {type -> size} ordering, which may produce better deltas.
388
	 */
389
	for_each_packed_object(write_oid, &cmd,
390
			       FOR_EACH_OBJECT_PROMISOR_ONLY);
391

392
	if (cmd.in == -1) {
393
		/* No packed objects; cmd was never started */
394
		child_process_clear(&cmd);
395
		return;
396
	}
397

398
	close(cmd.in);
399

400
	out = xfdopen(cmd.out, "r");
401
	while (strbuf_getline_lf(&line, out) != EOF) {
402
		struct string_list_item *item;
403
		char *promisor_name;
404

405
		if (line.len != the_hash_algo->hexsz)
406
			die(_("repack: Expecting full hex object ID lines only from pack-objects."));
407
		item = string_list_append(names, line.buf);
408

409
		/*
410
		 * pack-objects creates the .pack and .idx files, but not the
411
		 * .promisor file. Create the .promisor file, which is empty.
412
		 *
413
		 * NEEDSWORK: fetch-pack sometimes generates non-empty
414
		 * .promisor files containing the ref names and associated
415
		 * hashes at the point of generation of the corresponding
416
		 * packfile, but this would not preserve their contents. Maybe
417
		 * concatenate the contents of all .promisor files instead of
418
		 * just creating a new empty file.
419
		 */
420
		promisor_name = mkpathdup("%s-%s.promisor", packtmp,
421
					  line.buf);
422
		write_promisor_file(promisor_name, NULL, 0);
423

424
		item->util = populate_pack_exts(item->string);
425

426
		free(promisor_name);
427
	}
428
	fclose(out);
429
	if (finish_command(&cmd))
430
		die(_("could not finish pack-objects to repack promisor objects"));
431
}
432

433
struct pack_geometry {
434
	struct packed_git **pack;
435
	uint32_t pack_nr, pack_alloc;
436
	uint32_t split;
437

438
	int split_factor;
439
};
440

441
static uint32_t geometry_pack_weight(struct packed_git *p)
442
{
443
	if (open_pack_index(p))
444
		die(_("cannot open index for %s"), p->pack_name);
445
	return p->num_objects;
446
}
447

448
static int geometry_cmp(const void *va, const void *vb)
449
{
450
	uint32_t aw = geometry_pack_weight(*(struct packed_git **)va),
451
		 bw = geometry_pack_weight(*(struct packed_git **)vb);
452

453
	if (aw < bw)
454
		return -1;
455
	if (aw > bw)
456
		return 1;
457
	return 0;
458
}
459

460
static void init_pack_geometry(struct pack_geometry *geometry,
461
			       struct existing_packs *existing,
462
			       const struct pack_objects_args *args)
463
{
464
	struct packed_git *p;
465
	struct strbuf buf = STRBUF_INIT;
466

467
	for (p = get_all_packs(the_repository); p; p = p->next) {
468
		if (args->local && !p->pack_local)
469
			/*
470
			 * When asked to only repack local packfiles we skip
471
			 * over any packfiles that are borrowed from alternate
472
			 * object directories.
473
			 */
474
			continue;
475

476
		if (!pack_kept_objects) {
477
			/*
478
			 * Any pack that has its pack_keep bit set will
479
			 * appear in existing->kept_packs below, but
480
			 * this saves us from doing a more expensive
481
			 * check.
482
			 */
483
			if (p->pack_keep)
484
				continue;
485

486
			/*
487
			 * The pack may be kept via the --keep-pack
488
			 * option; check 'existing->kept_packs' to
489
			 * determine whether to ignore it.
490
			 */
491
			strbuf_reset(&buf);
492
			strbuf_addstr(&buf, pack_basename(p));
493
			strbuf_strip_suffix(&buf, ".pack");
494

495
			if (string_list_has_string(&existing->kept_packs, buf.buf))
496
				continue;
497
		}
498
		if (p->is_cruft)
499
			continue;
500

501
		ALLOC_GROW(geometry->pack,
502
			   geometry->pack_nr + 1,
503
			   geometry->pack_alloc);
504

505
		geometry->pack[geometry->pack_nr] = p;
506
		geometry->pack_nr++;
507
	}
508

509
	QSORT(geometry->pack, geometry->pack_nr, geometry_cmp);
510
	strbuf_release(&buf);
511
}
512

513
static void split_pack_geometry(struct pack_geometry *geometry)
514
{
515
	uint32_t i;
516
	uint32_t split;
517
	off_t total_size = 0;
518

519
	if (!geometry->pack_nr) {
520
		geometry->split = geometry->pack_nr;
521
		return;
522
	}
523

524
	/*
525
	 * First, count the number of packs (in descending order of size) which
526
	 * already form a geometric progression.
527
	 */
528
	for (i = geometry->pack_nr - 1; i > 0; i--) {
529
		struct packed_git *ours = geometry->pack[i];
530
		struct packed_git *prev = geometry->pack[i - 1];
531

532
		if (unsigned_mult_overflows(geometry->split_factor,
533
					    geometry_pack_weight(prev)))
534
			die(_("pack %s too large to consider in geometric "
535
			      "progression"),
536
			    prev->pack_name);
537

538
		if (geometry_pack_weight(ours) <
539
		    geometry->split_factor * geometry_pack_weight(prev))
540
			break;
541
	}
542

543
	split = i;
544

545
	if (split) {
546
		/*
547
		 * Move the split one to the right, since the top element in the
548
		 * last-compared pair can't be in the progression. Only do this
549
		 * when we split in the middle of the array (otherwise if we got
550
		 * to the end, then the split is in the right place).
551
		 */
552
		split++;
553
	}
554

555
	/*
556
	 * Then, anything to the left of 'split' must be in a new pack. But,
557
	 * creating that new pack may cause packs in the heavy half to no longer
558
	 * form a geometric progression.
559
	 *
560
	 * Compute an expected size of the new pack, and then determine how many
561
	 * packs in the heavy half need to be joined into it (if any) to restore
562
	 * the geometric progression.
563
	 */
564
	for (i = 0; i < split; i++) {
565
		struct packed_git *p = geometry->pack[i];
566

567
		if (unsigned_add_overflows(total_size, geometry_pack_weight(p)))
568
			die(_("pack %s too large to roll up"), p->pack_name);
569
		total_size += geometry_pack_weight(p);
570
	}
571
	for (i = split; i < geometry->pack_nr; i++) {
572
		struct packed_git *ours = geometry->pack[i];
573

574
		if (unsigned_mult_overflows(geometry->split_factor,
575
					    total_size))
576
			die(_("pack %s too large to roll up"), ours->pack_name);
577

578
		if (geometry_pack_weight(ours) <
579
		    geometry->split_factor * total_size) {
580
			if (unsigned_add_overflows(total_size,
581
						   geometry_pack_weight(ours)))
582
				die(_("pack %s too large to roll up"),
583
				    ours->pack_name);
584

585
			split++;
586
			total_size += geometry_pack_weight(ours);
587
		} else
588
			break;
589
	}
590

591
	geometry->split = split;
592
}
593

594
static struct packed_git *get_preferred_pack(struct pack_geometry *geometry)
595
{
596
	uint32_t i;
597

598
	if (!geometry) {
599
		/*
600
		 * No geometry means either an all-into-one repack (in which
601
		 * case there is only one pack left and it is the largest) or an
602
		 * incremental one.
603
		 *
604
		 * If repacking incrementally, then we could check the size of
605
		 * all packs to determine which should be preferred, but leave
606
		 * this for later.
607
		 */
608
		return NULL;
609
	}
610
	if (geometry->split == geometry->pack_nr)
611
		return NULL;
612

613
	/*
614
	 * The preferred pack is the largest pack above the split line. In
615
	 * other words, it is the largest pack that does not get rolled up in
616
	 * the geometric repack.
617
	 */
618
	for (i = geometry->pack_nr; i > geometry->split; i--)
619
		/*
620
		 * A pack that is not local would never be included in a
621
		 * multi-pack index. We thus skip over any non-local packs.
622
		 */
623
		if (geometry->pack[i - 1]->pack_local)
624
			return geometry->pack[i - 1];
625

626
	return NULL;
627
}
628

629
static void geometry_remove_redundant_packs(struct pack_geometry *geometry,
630
					    struct string_list *names,
631
					    struct existing_packs *existing)
632
{
633
	struct strbuf buf = STRBUF_INIT;
634
	uint32_t i;
635

636
	for (i = 0; i < geometry->split; i++) {
637
		struct packed_git *p = geometry->pack[i];
638
		if (string_list_has_string(names, hash_to_hex(p->hash)))
639
			continue;
640

641
		strbuf_reset(&buf);
642
		strbuf_addstr(&buf, pack_basename(p));
643
		strbuf_strip_suffix(&buf, ".pack");
644

645
		if ((p->pack_keep) ||
646
		    (string_list_has_string(&existing->kept_packs, buf.buf)))
647
			continue;
648

649
		remove_redundant_pack(packdir, buf.buf);
650
	}
651

652
	strbuf_release(&buf);
653
}
654

655
static void free_pack_geometry(struct pack_geometry *geometry)
656
{
657
	if (!geometry)
658
		return;
659

660
	free(geometry->pack);
661
}
662

663
struct midx_snapshot_ref_data {
664
	struct tempfile *f;
665
	struct oidset seen;
666
	int preferred;
667
};
668

669
static int midx_snapshot_ref_one(const char *refname UNUSED,
670
				 const char *referent UNUSED,
671
				 const struct object_id *oid,
672
				 int flag UNUSED, void *_data)
673
{
674
	struct midx_snapshot_ref_data *data = _data;
675
	struct object_id peeled;
676

677
	if (!peel_iterated_oid(the_repository, oid, &peeled))
678
		oid = &peeled;
679

680
	if (oidset_insert(&data->seen, oid))
681
		return 0; /* already seen */
682

683
	if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT)
684
		return 0;
685

686
	fprintf(data->f->fp, "%s%s\n", data->preferred ? "+" : "",
687
		oid_to_hex(oid));
688

689
	return 0;
690
}
691

692
static void midx_snapshot_refs(struct tempfile *f)
693
{
694
	struct midx_snapshot_ref_data data;
695
	const struct string_list *preferred = bitmap_preferred_tips(the_repository);
696

697
	data.f = f;
698
	data.preferred = 0;
699
	oidset_init(&data.seen, 0);
700

701
	if (!fdopen_tempfile(f, "w"))
702
		 die(_("could not open tempfile %s for writing"),
703
		     get_tempfile_path(f));
704

705
	if (preferred) {
706
		struct string_list_item *item;
707

708
		data.preferred = 1;
709
		for_each_string_list_item(item, preferred)
710
			refs_for_each_ref_in(get_main_ref_store(the_repository),
711
					     item->string,
712
					     midx_snapshot_ref_one, &data);
713
		data.preferred = 0;
714
	}
715

716
	refs_for_each_ref(get_main_ref_store(the_repository),
717
			  midx_snapshot_ref_one, &data);
718

719
	if (close_tempfile_gently(f)) {
720
		int save_errno = errno;
721
		delete_tempfile(&f);
722
		errno = save_errno;
723
		die_errno(_("could not close refs snapshot tempfile"));
724
	}
725

726
	oidset_clear(&data.seen);
727
}
728

729
static void midx_included_packs(struct string_list *include,
730
				struct existing_packs *existing,
731
				struct string_list *names,
732
				struct pack_geometry *geometry)
733
{
734
	struct string_list_item *item;
735

736
	for_each_string_list_item(item, &existing->kept_packs)
737
		string_list_insert(include, xstrfmt("%s.idx", item->string));
738
	for_each_string_list_item(item, names)
739
		string_list_insert(include, xstrfmt("pack-%s.idx", item->string));
740
	if (geometry->split_factor) {
741
		struct strbuf buf = STRBUF_INIT;
742
		uint32_t i;
743
		for (i = geometry->split; i < geometry->pack_nr; i++) {
744
			struct packed_git *p = geometry->pack[i];
745

746
			/*
747
			 * The multi-pack index never refers to packfiles part
748
			 * of an alternate object database, so we skip these.
749
			 * While git-multi-pack-index(1) would silently ignore
750
			 * them anyway, this allows us to skip executing the
751
			 * command completely when we have only non-local
752
			 * packfiles.
753
			 */
754
			if (!p->pack_local)
755
				continue;
756

757
			strbuf_addstr(&buf, pack_basename(p));
758
			strbuf_strip_suffix(&buf, ".pack");
759
			strbuf_addstr(&buf, ".idx");
760

761
			string_list_insert(include, strbuf_detach(&buf, NULL));
762
		}
763
	} else {
764
		for_each_string_list_item(item, &existing->non_kept_packs) {
765
			if (pack_is_marked_for_deletion(item))
766
				continue;
767
			string_list_insert(include, xstrfmt("%s.idx", item->string));
768
		}
769
	}
770

771
	for_each_string_list_item(item, &existing->cruft_packs) {
772
		/*
773
		 * When doing a --geometric repack, there is no need to check
774
		 * for deleted packs, since we're by definition not doing an
775
		 * ALL_INTO_ONE repack (hence no packs will be deleted).
776
		 * Otherwise we must check for and exclude any packs which are
777
		 * enqueued for deletion.
778
		 *
779
		 * So we could omit the conditional below in the --geometric
780
		 * case, but doing so is unnecessary since no packs are marked
781
		 * as pending deletion (since we only call
782
		 * `mark_packs_for_deletion()` when doing an all-into-one
783
		 * repack).
784
		 */
785
		if (pack_is_marked_for_deletion(item))
786
			continue;
787
		string_list_insert(include, xstrfmt("%s.idx", item->string));
788
	}
789
}
790

791
static int write_midx_included_packs(struct string_list *include,
792
				     struct pack_geometry *geometry,
793
				     struct string_list *names,
794
				     const char *refs_snapshot,
795
				     int show_progress, int write_bitmaps)
796
{
797
	struct child_process cmd = CHILD_PROCESS_INIT;
798
	struct string_list_item *item;
799
	struct packed_git *preferred = get_preferred_pack(geometry);
800
	FILE *in;
801
	int ret;
802

803
	if (!include->nr)
804
		return 0;
805

806
	cmd.in = -1;
807
	cmd.git_cmd = 1;
808

809
	strvec_push(&cmd.args, "multi-pack-index");
810
	strvec_pushl(&cmd.args, "write", "--stdin-packs", NULL);
811

812
	if (show_progress)
813
		strvec_push(&cmd.args, "--progress");
814
	else
815
		strvec_push(&cmd.args, "--no-progress");
816

817
	if (write_bitmaps)
818
		strvec_push(&cmd.args, "--bitmap");
819

820
	if (preferred)
821
		strvec_pushf(&cmd.args, "--preferred-pack=%s",
822
			     pack_basename(preferred));
823
	else if (names->nr) {
824
		/* The largest pack was repacked, meaning that either
825
		 * one or two packs exist depending on whether the
826
		 * repository has a cruft pack or not.
827
		 *
828
		 * Select the non-cruft one as preferred to encourage
829
		 * pack-reuse among packs containing reachable objects
830
		 * over unreachable ones.
831
		 *
832
		 * (Note we could write multiple packs here if
833
		 * `--max-pack-size` was given, but any one of them
834
		 * will suffice, so pick the first one.)
835
		 */
836
		for_each_string_list_item(item, names) {
837
			struct generated_pack_data *data = item->util;
838
			if (has_pack_ext(data, ".mtimes"))
839
				continue;
840

841
			strvec_pushf(&cmd.args, "--preferred-pack=pack-%s.pack",
842
				     item->string);
843
			break;
844
		}
845
	} else {
846
		/*
847
		 * No packs were kept, and no packs were written. The
848
		 * only thing remaining are .keep packs (unless
849
		 * --pack-kept-objects was given).
850
		 *
851
		 * Set the `--preferred-pack` arbitrarily here.
852
		 */
853
		;
854
	}
855

856
	if (refs_snapshot)
857
		strvec_pushf(&cmd.args, "--refs-snapshot=%s", refs_snapshot);
858

859
	ret = start_command(&cmd);
860
	if (ret)
861
		return ret;
862

863
	in = xfdopen(cmd.in, "w");
864
	for_each_string_list_item(item, include)
865
		fprintf(in, "%s\n", item->string);
866
	fclose(in);
867

868
	return finish_command(&cmd);
869
}
870

871
static void remove_redundant_bitmaps(struct string_list *include,
872
				     const char *packdir)
873
{
874
	struct strbuf path = STRBUF_INIT;
875
	struct string_list_item *item;
876
	size_t packdir_len;
877

878
	strbuf_addstr(&path, packdir);
879
	strbuf_addch(&path, '/');
880
	packdir_len = path.len;
881

882
	/*
883
	 * Remove any pack bitmaps corresponding to packs which are now
884
	 * included in the MIDX.
885
	 */
886
	for_each_string_list_item(item, include) {
887
		strbuf_addstr(&path, item->string);
888
		strbuf_strip_suffix(&path, ".idx");
889
		strbuf_addstr(&path, ".bitmap");
890

891
		if (unlink(path.buf) && errno != ENOENT)
892
			warning_errno(_("could not remove stale bitmap: %s"),
893
				      path.buf);
894

895
		strbuf_setlen(&path, packdir_len);
896
	}
897
	strbuf_release(&path);
898
}
899

900
static int finish_pack_objects_cmd(struct child_process *cmd,
901
				   struct string_list *names,
902
				   int local)
903
{
904
	FILE *out;
905
	struct strbuf line = STRBUF_INIT;
906

907
	out = xfdopen(cmd->out, "r");
908
	while (strbuf_getline_lf(&line, out) != EOF) {
909
		struct string_list_item *item;
910

911
		if (line.len != the_hash_algo->hexsz)
912
			die(_("repack: Expecting full hex object ID lines only "
913
			      "from pack-objects."));
914
		/*
915
		 * Avoid putting packs written outside of the repository in the
916
		 * list of names.
917
		 */
918
		if (local) {
919
			item = string_list_append(names, line.buf);
920
			item->util = populate_pack_exts(line.buf);
921
		}
922
	}
923
	fclose(out);
924

925
	strbuf_release(&line);
926

927
	return finish_command(cmd);
928
}
929

930
static int write_filtered_pack(const struct pack_objects_args *args,
931
			       const char *destination,
932
			       const char *pack_prefix,
933
			       struct existing_packs *existing,
934
			       struct string_list *names)
935
{
936
	struct child_process cmd = CHILD_PROCESS_INIT;
937
	struct string_list_item *item;
938
	FILE *in;
939
	int ret;
940
	const char *caret;
941
	const char *scratch;
942
	int local = skip_prefix(destination, packdir, &scratch);
943

944
	prepare_pack_objects(&cmd, args, destination);
945

946
	strvec_push(&cmd.args, "--stdin-packs");
947

948
	if (!pack_kept_objects)
949
		strvec_push(&cmd.args, "--honor-pack-keep");
950
	for_each_string_list_item(item, &existing->kept_packs)
951
		strvec_pushf(&cmd.args, "--keep-pack=%s", item->string);
952

953
	cmd.in = -1;
954

955
	ret = start_command(&cmd);
956
	if (ret)
957
		return ret;
958

959
	/*
960
	 * Here 'names' contains only the pack(s) that were just
961
	 * written, which is exactly the packs we want to keep. Also
962
	 * 'existing_kept_packs' already contains the packs in
963
	 * 'keep_pack_list'.
964
	 */
965
	in = xfdopen(cmd.in, "w");
966
	for_each_string_list_item(item, names)
967
		fprintf(in, "^%s-%s.pack\n", pack_prefix, item->string);
968
	for_each_string_list_item(item, &existing->non_kept_packs)
969
		fprintf(in, "%s.pack\n", item->string);
970
	for_each_string_list_item(item, &existing->cruft_packs)
971
		fprintf(in, "%s.pack\n", item->string);
972
	caret = pack_kept_objects ? "" : "^";
973
	for_each_string_list_item(item, &existing->kept_packs)
974
		fprintf(in, "%s%s.pack\n", caret, item->string);
975
	fclose(in);
976

977
	return finish_pack_objects_cmd(&cmd, names, local);
978
}
979

980
static int existing_cruft_pack_cmp(const void *va, const void *vb)
981
{
982
	struct packed_git *a = *(struct packed_git **)va;
983
	struct packed_git *b = *(struct packed_git **)vb;
984

985
	if (a->pack_size < b->pack_size)
986
		return -1;
987
	if (a->pack_size > b->pack_size)
988
		return 1;
989
	return 0;
990
}
991

992
static void collapse_small_cruft_packs(FILE *in, size_t max_size,
993
				       struct existing_packs *existing)
994
{
995
	struct packed_git **existing_cruft, *p;
996
	struct strbuf buf = STRBUF_INIT;
997
	size_t total_size = 0;
998
	size_t existing_cruft_nr = 0;
999
	size_t i;
1000

1001
	ALLOC_ARRAY(existing_cruft, existing->cruft_packs.nr);
1002

1003
	for (p = get_all_packs(the_repository); p; p = p->next) {
1004
		if (!(p->is_cruft && p->pack_local))
1005
			continue;
1006

1007
		strbuf_reset(&buf);
1008
		strbuf_addstr(&buf, pack_basename(p));
1009
		strbuf_strip_suffix(&buf, ".pack");
1010

1011
		if (!string_list_has_string(&existing->cruft_packs, buf.buf))
1012
			continue;
1013

1014
		if (existing_cruft_nr >= existing->cruft_packs.nr)
1015
			BUG("too many cruft packs (found %"PRIuMAX", but knew "
1016
			    "of %"PRIuMAX")",
1017
			    (uintmax_t)existing_cruft_nr + 1,
1018
			    (uintmax_t)existing->cruft_packs.nr);
1019
		existing_cruft[existing_cruft_nr++] = p;
1020
	}
1021

1022
	QSORT(existing_cruft, existing_cruft_nr, existing_cruft_pack_cmp);
1023

1024
	for (i = 0; i < existing_cruft_nr; i++) {
1025
		size_t proposed;
1026

1027
		p = existing_cruft[i];
1028
		proposed = st_add(total_size, p->pack_size);
1029

1030
		if (proposed <= max_size) {
1031
			total_size = proposed;
1032
			fprintf(in, "-%s\n", pack_basename(p));
1033
		} else {
1034
			retain_cruft_pack(existing, p);
1035
			fprintf(in, "%s\n", pack_basename(p));
1036
		}
1037
	}
1038

1039
	for (i = 0; i < existing->non_kept_packs.nr; i++)
1040
		fprintf(in, "-%s.pack\n",
1041
			existing->non_kept_packs.items[i].string);
1042

1043
	strbuf_release(&buf);
1044
	free(existing_cruft);
1045
}
1046

1047
static int write_cruft_pack(const struct pack_objects_args *args,
1048
			    const char *destination,
1049
			    const char *pack_prefix,
1050
			    const char *cruft_expiration,
1051
			    struct string_list *names,
1052
			    struct existing_packs *existing)
1053
{
1054
	struct child_process cmd = CHILD_PROCESS_INIT;
1055
	struct string_list_item *item;
1056
	FILE *in;
1057
	int ret;
1058
	const char *scratch;
1059
	int local = skip_prefix(destination, packdir, &scratch);
1060

1061
	prepare_pack_objects(&cmd, args, destination);
1062

1063
	strvec_push(&cmd.args, "--cruft");
1064
	if (cruft_expiration)
1065
		strvec_pushf(&cmd.args, "--cruft-expiration=%s",
1066
			     cruft_expiration);
1067

1068
	strvec_push(&cmd.args, "--honor-pack-keep");
1069
	strvec_push(&cmd.args, "--non-empty");
1070

1071
	cmd.in = -1;
1072

1073
	ret = start_command(&cmd);
1074
	if (ret)
1075
		return ret;
1076

1077
	/*
1078
	 * names has a confusing double use: it both provides the list
1079
	 * of just-written new packs, and accepts the name of the cruft
1080
	 * pack we are writing.
1081
	 *
1082
	 * By the time it is read here, it contains only the pack(s)
1083
	 * that were just written, which is exactly the set of packs we
1084
	 * want to consider kept.
1085
	 *
1086
	 * If `--expire-to` is given, the double-use served by `names`
1087
	 * ensures that the pack written to `--expire-to` excludes any
1088
	 * objects contained in the cruft pack.
1089
	 */
1090
	in = xfdopen(cmd.in, "w");
1091
	for_each_string_list_item(item, names)
1092
		fprintf(in, "%s-%s.pack\n", pack_prefix, item->string);
1093
	if (args->max_pack_size && !cruft_expiration) {
1094
		collapse_small_cruft_packs(in, args->max_pack_size, existing);
1095
	} else {
1096
		for_each_string_list_item(item, &existing->non_kept_packs)
1097
			fprintf(in, "-%s.pack\n", item->string);
1098
		for_each_string_list_item(item, &existing->cruft_packs)
1099
			fprintf(in, "-%s.pack\n", item->string);
1100
	}
1101
	for_each_string_list_item(item, &existing->kept_packs)
1102
		fprintf(in, "%s.pack\n", item->string);
1103
	fclose(in);
1104

1105
	return finish_pack_objects_cmd(&cmd, names, local);
1106
}
1107

1108
static const char *find_pack_prefix(const char *packdir, const char *packtmp)
1109
{
1110
	const char *pack_prefix;
1111
	if (!skip_prefix(packtmp, packdir, &pack_prefix))
1112
		die(_("pack prefix %s does not begin with objdir %s"),
1113
		    packtmp, packdir);
1114
	if (*pack_prefix == '/')
1115
		pack_prefix++;
1116
	return pack_prefix;
1117
}
1118

1119
int cmd_repack(int argc, const char **argv, const char *prefix)
1120
{
1121
	struct child_process cmd = CHILD_PROCESS_INIT;
1122
	struct string_list_item *item;
1123
	struct string_list names = STRING_LIST_INIT_DUP;
1124
	struct existing_packs existing = EXISTING_PACKS_INIT;
1125
	struct pack_geometry geometry = { 0 };
1126
	struct tempfile *refs_snapshot = NULL;
1127
	int i, ext, ret;
1128
	int show_progress;
1129

1130
	/* variables to be filled by option parsing */
1131
	int delete_redundant = 0;
1132
	const char *unpack_unreachable = NULL;
1133
	int keep_unreachable = 0;
1134
	struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;
1135
	struct pack_objects_args po_args = {NULL};
1136
	struct pack_objects_args cruft_po_args = {NULL};
1137
	int write_midx = 0;
1138
	const char *cruft_expiration = NULL;
1139
	const char *expire_to = NULL;
1140
	const char *filter_to = NULL;
1141

1142
	struct option builtin_repack_options[] = {
1143
		OPT_BIT('a', NULL, &pack_everything,
1144
				N_("pack everything in a single pack"), ALL_INTO_ONE),
1145
		OPT_BIT('A', NULL, &pack_everything,
1146
				N_("same as -a, and turn unreachable objects loose"),
1147
				   LOOSEN_UNREACHABLE | ALL_INTO_ONE),
1148
		OPT_BIT(0, "cruft", &pack_everything,
1149
				N_("same as -a, pack unreachable cruft objects separately"),
1150
				   PACK_CRUFT),
1151
		OPT_STRING(0, "cruft-expiration", &cruft_expiration, N_("approxidate"),
1152
				N_("with --cruft, expire objects older than this")),
1153
		OPT_MAGNITUDE(0, "max-cruft-size", &cruft_po_args.max_pack_size,
1154
				N_("with --cruft, limit the size of new cruft packs")),
1155
		OPT_BOOL('d', NULL, &delete_redundant,
1156
				N_("remove redundant packs, and run git-prune-packed")),
1157
		OPT_BOOL('f', NULL, &po_args.no_reuse_delta,
1158
				N_("pass --no-reuse-delta to git-pack-objects")),
1159
		OPT_BOOL('F', NULL, &po_args.no_reuse_object,
1160
				N_("pass --no-reuse-object to git-pack-objects")),
1161
		OPT_NEGBIT('n', NULL, &run_update_server_info,
1162
				N_("do not run git-update-server-info"), 1),
1163
		OPT__QUIET(&po_args.quiet, N_("be quiet")),
1164
		OPT_BOOL('l', "local", &po_args.local,
1165
				N_("pass --local to git-pack-objects")),
1166
		OPT_BOOL('b', "write-bitmap-index", &write_bitmaps,
1167
				N_("write bitmap index")),
1168
		OPT_BOOL('i', "delta-islands", &use_delta_islands,
1169
				N_("pass --delta-islands to git-pack-objects")),
1170
		OPT_STRING(0, "unpack-unreachable", &unpack_unreachable, N_("approxidate"),
1171
				N_("with -A, do not loosen objects older than this")),
1172
		OPT_BOOL('k', "keep-unreachable", &keep_unreachable,
1173
				N_("with -a, repack unreachable objects")),
1174
		OPT_STRING(0, "window", &po_args.window, N_("n"),
1175
				N_("size of the window used for delta compression")),
1176
		OPT_STRING(0, "window-memory", &po_args.window_memory, N_("bytes"),
1177
				N_("same as the above, but limit memory size instead of entries count")),
1178
		OPT_STRING(0, "depth", &po_args.depth, N_("n"),
1179
				N_("limits the maximum delta depth")),
1180
		OPT_STRING(0, "threads", &po_args.threads, N_("n"),
1181
				N_("limits the maximum number of threads")),
1182
		OPT_MAGNITUDE(0, "max-pack-size", &po_args.max_pack_size,
1183
				N_("maximum size of each packfile")),
1184
		OPT_PARSE_LIST_OBJECTS_FILTER(&po_args.filter_options),
1185
		OPT_BOOL(0, "pack-kept-objects", &pack_kept_objects,
1186
				N_("repack objects in packs marked with .keep")),
1187
		OPT_STRING_LIST(0, "keep-pack", &keep_pack_list, N_("name"),
1188
				N_("do not repack this pack")),
1189
		OPT_INTEGER('g', "geometric", &geometry.split_factor,
1190
			    N_("find a geometric progression with factor <N>")),
1191
		OPT_BOOL('m', "write-midx", &write_midx,
1192
			   N_("write a multi-pack index of the resulting packs")),
1193
		OPT_STRING(0, "expire-to", &expire_to, N_("dir"),
1194
			   N_("pack prefix to store a pack containing pruned objects")),
1195
		OPT_STRING(0, "filter-to", &filter_to, N_("dir"),
1196
			   N_("pack prefix to store a pack containing filtered out objects")),
1197
		OPT_END()
1198
	};
1199

1200
	list_objects_filter_init(&po_args.filter_options);
1201

1202
	git_config(repack_config, &cruft_po_args);
1203

1204
	argc = parse_options(argc, argv, prefix, builtin_repack_options,
1205
				git_repack_usage, 0);
1206

1207
	if (delete_redundant && repository_format_precious_objects)
1208
		die(_("cannot delete packs in a precious-objects repo"));
1209

1210
	die_for_incompatible_opt3(unpack_unreachable || (pack_everything & LOOSEN_UNREACHABLE), "-A",
1211
				  keep_unreachable, "-k/--keep-unreachable",
1212
				  pack_everything & PACK_CRUFT, "--cruft");
1213

1214
	if (pack_everything & PACK_CRUFT)
1215
		pack_everything |= ALL_INTO_ONE;
1216

1217
	if (write_bitmaps < 0) {
1218
		if (!write_midx &&
1219
		    (!(pack_everything & ALL_INTO_ONE) || !is_bare_repository()))
1220
			write_bitmaps = 0;
1221
	}
1222
	if (pack_kept_objects < 0)
1223
		pack_kept_objects = write_bitmaps > 0 && !write_midx;
1224

1225
	if (write_bitmaps && !(pack_everything & ALL_INTO_ONE) && !write_midx)
1226
		die(_(incremental_bitmap_conflict_error));
1227

1228
	if (write_bitmaps && po_args.local && has_alt_odb(the_repository)) {
1229
		/*
1230
		 * When asked to do a local repack, but we have
1231
		 * packfiles that are inherited from an alternate, then
1232
		 * we cannot guarantee that the multi-pack-index would
1233
		 * have full coverage of all objects. We thus disable
1234
		 * writing bitmaps in that case.
1235
		 */
1236
		warning(_("disabling bitmap writing, as some objects are not being packed"));
1237
		write_bitmaps = 0;
1238
	}
1239

1240
	if (write_midx && write_bitmaps) {
1241
		struct strbuf path = STRBUF_INIT;
1242

1243
		strbuf_addf(&path, "%s/%s_XXXXXX", get_object_directory(),
1244
			    "bitmap-ref-tips");
1245

1246
		refs_snapshot = xmks_tempfile(path.buf);
1247
		midx_snapshot_refs(refs_snapshot);
1248

1249
		strbuf_release(&path);
1250
	}
1251

1252
	packdir = mkpathdup("%s/pack", get_object_directory());
1253
	packtmp_name = xstrfmt(".tmp-%d-pack", (int)getpid());
1254
	packtmp = mkpathdup("%s/%s", packdir, packtmp_name);
1255

1256
	collect_pack_filenames(&existing, &keep_pack_list);
1257

1258
	if (geometry.split_factor) {
1259
		if (pack_everything)
1260
			die(_("options '%s' and '%s' cannot be used together"), "--geometric", "-A/-a");
1261
		init_pack_geometry(&geometry, &existing, &po_args);
1262
		split_pack_geometry(&geometry);
1263
	}
1264

1265
	prepare_pack_objects(&cmd, &po_args, packtmp);
1266

1267
	show_progress = !po_args.quiet && isatty(2);
1268

1269
	strvec_push(&cmd.args, "--keep-true-parents");
1270
	if (!pack_kept_objects)
1271
		strvec_push(&cmd.args, "--honor-pack-keep");
1272
	for (i = 0; i < keep_pack_list.nr; i++)
1273
		strvec_pushf(&cmd.args, "--keep-pack=%s",
1274
			     keep_pack_list.items[i].string);
1275
	strvec_push(&cmd.args, "--non-empty");
1276
	if (!geometry.split_factor) {
1277
		/*
1278
		 * We need to grab all reachable objects, including those that
1279
		 * are reachable from reflogs and the index.
1280
		 *
1281
		 * When repacking into a geometric progression of packs,
1282
		 * however, we ask 'git pack-objects --stdin-packs', and it is
1283
		 * not about packing objects based on reachability but about
1284
		 * repacking all the objects in specified packs and loose ones
1285
		 * (indeed, --stdin-packs is incompatible with these options).
1286
		 */
1287
		strvec_push(&cmd.args, "--all");
1288
		strvec_push(&cmd.args, "--reflog");
1289
		strvec_push(&cmd.args, "--indexed-objects");
1290
	}
1291
	if (repo_has_promisor_remote(the_repository))
1292
		strvec_push(&cmd.args, "--exclude-promisor-objects");
1293
	if (!write_midx) {
1294
		if (write_bitmaps > 0)
1295
			strvec_push(&cmd.args, "--write-bitmap-index");
1296
		else if (write_bitmaps < 0)
1297
			strvec_push(&cmd.args, "--write-bitmap-index-quiet");
1298
	}
1299
	if (use_delta_islands)
1300
		strvec_push(&cmd.args, "--delta-islands");
1301

1302
	if (pack_everything & ALL_INTO_ONE) {
1303
		repack_promisor_objects(&po_args, &names);
1304

1305
		if (has_existing_non_kept_packs(&existing) &&
1306
		    delete_redundant &&
1307
		    !(pack_everything & PACK_CRUFT)) {
1308
			for_each_string_list_item(item, &names) {
1309
				strvec_pushf(&cmd.args, "--keep-pack=%s-%s.pack",
1310
					     packtmp_name, item->string);
1311
			}
1312
			if (unpack_unreachable) {
1313
				strvec_pushf(&cmd.args,
1314
					     "--unpack-unreachable=%s",
1315
					     unpack_unreachable);
1316
			} else if (pack_everything & LOOSEN_UNREACHABLE) {
1317
				strvec_push(&cmd.args,
1318
					    "--unpack-unreachable");
1319
			} else if (keep_unreachable) {
1320
				strvec_push(&cmd.args, "--keep-unreachable");
1321
				strvec_push(&cmd.args, "--pack-loose-unreachable");
1322
			}
1323
		}
1324
	} else if (geometry.split_factor) {
1325
		strvec_push(&cmd.args, "--stdin-packs");
1326
		strvec_push(&cmd.args, "--unpacked");
1327
	} else {
1328
		strvec_push(&cmd.args, "--unpacked");
1329
		strvec_push(&cmd.args, "--incremental");
1330
	}
1331

1332
	if (po_args.filter_options.choice)
1333
		strvec_pushf(&cmd.args, "--filter=%s",
1334
			     expand_list_objects_filter_spec(&po_args.filter_options));
1335
	else if (filter_to)
1336
		die(_("option '%s' can only be used along with '%s'"), "--filter-to", "--filter");
1337

1338
	if (geometry.split_factor)
1339
		cmd.in = -1;
1340
	else
1341
		cmd.no_stdin = 1;
1342

1343
	ret = start_command(&cmd);
1344
	if (ret)
1345
		goto cleanup;
1346

1347
	if (geometry.split_factor) {
1348
		FILE *in = xfdopen(cmd.in, "w");
1349
		/*
1350
		 * The resulting pack should contain all objects in packs that
1351
		 * are going to be rolled up, but exclude objects in packs which
1352
		 * are being left alone.
1353
		 */
1354
		for (i = 0; i < geometry.split; i++)
1355
			fprintf(in, "%s\n", pack_basename(geometry.pack[i]));
1356
		for (i = geometry.split; i < geometry.pack_nr; i++)
1357
			fprintf(in, "^%s\n", pack_basename(geometry.pack[i]));
1358
		fclose(in);
1359
	}
1360

1361
	ret = finish_pack_objects_cmd(&cmd, &names, 1);
1362
	if (ret)
1363
		goto cleanup;
1364

1365
	if (!names.nr && !po_args.quiet)
1366
		printf_ln(_("Nothing new to pack."));
1367

1368
	if (pack_everything & PACK_CRUFT) {
1369
		const char *pack_prefix = find_pack_prefix(packdir, packtmp);
1370

1371
		if (!cruft_po_args.window)
1372
			cruft_po_args.window = po_args.window;
1373
		if (!cruft_po_args.window_memory)
1374
			cruft_po_args.window_memory = po_args.window_memory;
1375
		if (!cruft_po_args.depth)
1376
			cruft_po_args.depth = po_args.depth;
1377
		if (!cruft_po_args.threads)
1378
			cruft_po_args.threads = po_args.threads;
1379
		if (!cruft_po_args.max_pack_size)
1380
			cruft_po_args.max_pack_size = po_args.max_pack_size;
1381

1382
		cruft_po_args.local = po_args.local;
1383
		cruft_po_args.quiet = po_args.quiet;
1384

1385
		ret = write_cruft_pack(&cruft_po_args, packtmp, pack_prefix,
1386
				       cruft_expiration, &names,
1387
				       &existing);
1388
		if (ret)
1389
			goto cleanup;
1390

1391
		if (delete_redundant && expire_to) {
1392
			/*
1393
			 * If `--expire-to` is given with `-d`, it's possible
1394
			 * that we're about to prune some objects. With cruft
1395
			 * packs, pruning is implicit: any objects from existing
1396
			 * packs that weren't picked up by new packs are removed
1397
			 * when their packs are deleted.
1398
			 *
1399
			 * Generate an additional cruft pack, with one twist:
1400
			 * `names` now includes the name of the cruft pack
1401
			 * written in the previous step. So the contents of
1402
			 * _this_ cruft pack exclude everything contained in the
1403
			 * existing cruft pack (that is, all of the unreachable
1404
			 * objects which are no older than
1405
			 * `--cruft-expiration`).
1406
			 *
1407
			 * To make this work, cruft_expiration must become NULL
1408
			 * so that this cruft pack doesn't actually prune any
1409
			 * objects. If it were non-NULL, this call would always
1410
			 * generate an empty pack (since every object not in the
1411
			 * cruft pack generated above will have an mtime older
1412
			 * than the expiration).
1413
			 */
1414
			ret = write_cruft_pack(&cruft_po_args, expire_to,
1415
					       pack_prefix,
1416
					       NULL,
1417
					       &names,
1418
					       &existing);
1419
			if (ret)
1420
				goto cleanup;
1421
		}
1422
	}
1423

1424
	if (po_args.filter_options.choice) {
1425
		if (!filter_to)
1426
			filter_to = packtmp;
1427

1428
		ret = write_filtered_pack(&po_args,
1429
					  filter_to,
1430
					  find_pack_prefix(packdir, packtmp),
1431
					  &existing,
1432
					  &names);
1433
		if (ret)
1434
			goto cleanup;
1435
	}
1436

1437
	string_list_sort(&names);
1438

1439
	close_object_store(the_repository->objects);
1440

1441
	/*
1442
	 * Ok we have prepared all new packfiles.
1443
	 */
1444
	for_each_string_list_item(item, &names) {
1445
		struct generated_pack_data *data = item->util;
1446

1447
		for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
1448
			char *fname;
1449

1450
			fname = mkpathdup("%s/pack-%s%s",
1451
					packdir, item->string, exts[ext].name);
1452

1453
			if (data->tempfiles[ext]) {
1454
				const char *fname_old = get_tempfile_path(data->tempfiles[ext]);
1455
				struct stat statbuffer;
1456

1457
				if (!stat(fname_old, &statbuffer)) {
1458
					statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
1459
					chmod(fname_old, statbuffer.st_mode);
1460
				}
1461

1462
				if (rename_tempfile(&data->tempfiles[ext], fname))
1463
					die_errno(_("renaming pack to '%s' failed"), fname);
1464
			} else if (!exts[ext].optional)
1465
				die(_("pack-objects did not write a '%s' file for pack %s-%s"),
1466
				    exts[ext].name, packtmp, item->string);
1467
			else if (unlink(fname) < 0 && errno != ENOENT)
1468
				die_errno(_("could not unlink: %s"), fname);
1469

1470
			free(fname);
1471
		}
1472
	}
1473
	/* End of pack replacement. */
1474

1475
	if (delete_redundant && pack_everything & ALL_INTO_ONE)
1476
		mark_packs_for_deletion(&existing, &names);
1477

1478
	if (write_midx) {
1479
		struct string_list include = STRING_LIST_INIT_NODUP;
1480
		midx_included_packs(&include, &existing, &names, &geometry);
1481

1482
		ret = write_midx_included_packs(&include, &geometry, &names,
1483
						refs_snapshot ? get_tempfile_path(refs_snapshot) : NULL,
1484
						show_progress, write_bitmaps > 0);
1485

1486
		if (!ret && write_bitmaps)
1487
			remove_redundant_bitmaps(&include, packdir);
1488

1489
		string_list_clear(&include, 0);
1490

1491
		if (ret)
1492
			goto cleanup;
1493
	}
1494

1495
	reprepare_packed_git(the_repository);
1496

1497
	if (delete_redundant) {
1498
		int opts = 0;
1499
		remove_redundant_existing_packs(&existing);
1500

1501
		if (geometry.split_factor)
1502
			geometry_remove_redundant_packs(&geometry, &names,
1503
							&existing);
1504
		if (show_progress)
1505
			opts |= PRUNE_PACKED_VERBOSE;
1506
		prune_packed_objects(opts);
1507

1508
		if (!keep_unreachable &&
1509
		    (!(pack_everything & LOOSEN_UNREACHABLE) ||
1510
		     unpack_unreachable) &&
1511
		    is_repository_shallow(the_repository))
1512
			prune_shallow(PRUNE_QUICK);
1513
	}
1514

1515
	if (run_update_server_info)
1516
		update_server_info(0);
1517

1518
	if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0)) {
1519
		unsigned flags = 0;
1520
		if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX_WRITE_INCREMENTAL, 0))
1521
			flags |= MIDX_WRITE_INCREMENTAL;
1522
		write_midx_file(get_object_directory(), NULL, NULL, flags);
1523
	}
1524

1525
cleanup:
1526
	string_list_clear(&names, 1);
1527
	existing_packs_release(&existing);
1528
	free_pack_geometry(&geometry);
1529
	list_objects_filter_release(&po_args.filter_options);
1530

1531
	return ret;
1532
}
1533