diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-09-07 15:06:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-09-07 15:06:07 -0700 |
| commit | 8af5aac98667dfcce8ebe6efdb8df8aa0d134fb1 (patch) | |
| tree | 11e43de8991e177be6d3eae34794e877f64b3fda /builtin/pack-objects.c | |
| parent | 1fc548b2d6a3596f3e1c1f8b1930d8dbd1e30bf3 (diff) | |
| parent | c0b5d46ded46bf6e2cf4bb5325e4bf43374dd1ed (diff) | |
| download | git-8af5aac98667dfcce8ebe6efdb8df8aa0d134fb1.tar.xz | |
Merge branch 'tb/multi-cruft-pack'
Use of --max-pack-size to allow multiple packfiles to be created is
now supported even when we are sending unreachable objects to cruft
packs.
* tb/multi-cruft-pack:
Documentation/gitformat-pack.txt: drop mixed version section
Documentation/gitformat-pack.txt: remove multi-cruft packs alternative
builtin/pack-objects.c: support `--max-pack-size` with `--cruft`
builtin/pack-objects.c: remove unnecessary strbuf_reset()
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index d2a162d528..72241bdca4 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -3603,7 +3603,6 @@ static void read_cruft_objects(void) string_list_append(&discard_packs, buf.buf + 1); else string_list_append(&fresh_packs, buf.buf); - strbuf_reset(&buf); } string_list_sort(&discard_packs); @@ -4383,7 +4382,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) if (!HAVE_THREADS && delta_search_threads != 1) warning(_("no threads support, ignoring --threads")); - if (!pack_to_stdout && !pack_size_limit && !cruft) + if (!pack_to_stdout && !pack_size_limit) pack_size_limit = pack_size_limit_cfg; if (pack_to_stdout && pack_size_limit) die(_("--max-pack-size cannot be used to build a pack for transfer")); @@ -4415,8 +4414,6 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) die(_("cannot use internal rev list with --cruft")); if (stdin_packs) die(_("cannot use --stdin-packs with --cruft")); - if (pack_size_limit) - die(_("cannot use --max-pack-size with --cruft")); } /* |