diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-02-04 19:10:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-02-04 23:12:17 (GMT) |
| commit | 4d0cc2243778b38c3759c6a08f4f1ed64155a070 (patch) | |
| tree | a9f28cfa907d1b0a19c0661ef4562dc4b5036418 /Documentation | |
| parent | 9f17688d93c18bdd0532d2733710dc4d23921282 (diff) | |
| download | git-4d0cc2243778b38c3759c6a08f4f1ed64155a070.zip git-4d0cc2243778b38c3759c6a08f4f1ed64155a070.tar.gz git-4d0cc2243778b38c3759c6a08f4f1ed64155a070.tar.bz2 | |
fast-import: count --max-pack-size in bytes
Similar in spirit to 07cf0f2 (make --max-pack-size argument to 'git
pack-object' count in bytes, 2010-02-03) which made the option by the same
name to pack-objects, this counts the pack size limit in bytes.
In order not to cause havoc with people used to the previous megabyte
scale an integer smaller than 8192 is interpreted in megabytes but the
user gets a warning. Also a minimum size of 1 MiB is enforced to avoid an
explosion of pack files.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Acked-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/RelNotes-1.7.0.txt | 8 | ||||
| -rw-r--r-- | Documentation/git-fast-import.txt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/RelNotes-1.7.0.txt b/Documentation/RelNotes-1.7.0.txt index e66945c..255666f 100644 --- a/Documentation/RelNotes-1.7.0.txt +++ b/Documentation/RelNotes-1.7.0.txt @@ -46,10 +46,10 @@ Notes on behaviour change environment, and diff.*.command and diff.*.textconv in the config file. - * The --max-pack-size argument to 'git repack' and 'git pack-objects' was - assuming the provided size to be expressed in MiB, unlike the - corresponding config variable and other similar options accepting a size - value. It is now expecting a size expressed in bytes, with a possible + * The --max-pack-size argument to 'git repack', 'git pack-objects', and + 'git fast-import' was assuming the provided size to be expressed in MiB, + unlike the corresponding config variable and other similar options accepting + a size value. It is now expecting a size expressed in bytes, with a possible unit suffix of 'k', 'm', or 'g'. Updates since v1.6.6 diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2691114..6764ff1 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -44,8 +44,8 @@ OPTIONS not contain the old commit). --max-pack-size=<n>:: - Maximum size of each output packfile, expressed in MiB. - The default is 4096 (4 GiB) as that is the maximum allowed + Maximum size of each output packfile. + The default is 4 GiB as that is the maximum allowed packfile size (due to file format limitations). Some importers may wish to lower this, such as to ensure the resulting packfiles fit on CDs. |