undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ew/doc-split-pack-disables-bitmap'

Browse Source 
Doc update.

* ew/doc-split-pack-disables-bitmap:
  pack-objects: warn on split packs disabling bitmaps
This commit is contained in:
Junio C Hamano 2016-05-10 13:40:28 -07:00
commit 54c2af5aa3
4 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Documentation/config.txt
View File

@ -2162,8 +2162,11 @@ pack.packSizeLimit::
The maximum size of a pack. This setting only affects The maximum size of a pack. This setting only affects
packing to a file when repacking, i.e. the git:// protocol packing to a file when repacking, i.e. the git:// protocol
is unaffected. It can be overridden by the `--max-pack-size` is unaffected. It can be overridden by the `--max-pack-size`
option of linkgit:git-repack[1]. The minimum size allowed is option of linkgit:git-repack[1]. Reaching this limit results
limited to 1 MiB. The default is unlimited. in the creation of multiple packfiles; which in turn prevents
bitmaps from being created.
The minimum size allowed is limited to 1 MiB.
The default is unlimited.
Common unit suffixes of 'k', 'm', or 'g' are Common unit suffixes of 'k', 'm', or 'g' are
supported. supported.
@ -2563,8 +2566,9 @@ repack.writeBitmaps::
objects to disk (e.g., when `git repack -a` is run). This objects to disk (e.g., when `git repack -a` is run). This
index can speed up the "counting objects" phase of subsequent index can speed up the "counting objects" phase of subsequent
packs created for clones and fetches, at the cost of some disk packs created for clones and fetches, at the cost of some disk
space and extra time spent on the initial repack. Defaults to space and extra time spent on the initial repack. This has
false. no effect if multiple packfiles are created.
Defaults to false.
rerere.autoUpdate:: rerere.autoUpdate::
When set to true, `git-rerere` updates the index with the When set to true, `git-rerere` updates the index with the

3
Documentation/git-pack-objects.txt
View File

@ -110,7 +110,8 @@ base-name::
--max-pack-size=<n>:: --max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with Maximum size of each output pack file. The size can be suffixed with
"k", "m", or "g". The minimum size allowed is limited to 1 MiB. "k", "m", or "g". The minimum size allowed is limited to 1 MiB.
If specified, multiple packfiles may be created. If specified, multiple packfiles may be created, which also
prevents the creation of a bitmap index.
The default is unlimited, unless the config variable The default is unlimited, unless the config variable
`pack.packSizeLimit` is set. `pack.packSizeLimit` is set.

8
Documentation/git-repack.txt
View File

@ -106,7 +106,8 @@ other objects in that pack they already have locally.
--max-pack-size=<n>:: --max-pack-size=<n>::
Maximum size of each output pack file. The size can be suffixed with Maximum size of each output pack file. The size can be suffixed with
"k", "m", or "g". The minimum size allowed is limited to 1 MiB. "k", "m", or "g". The minimum size allowed is limited to 1 MiB.
If specified, multiple packfiles may be created. If specified, multiple packfiles may be created, which also
prevents the creation of a bitmap index.
The default is unlimited, unless the config variable The default is unlimited, unless the config variable
`pack.packSizeLimit` is set. `pack.packSizeLimit` is set.
@ -115,7 +116,8 @@ other objects in that pack they already have locally.
Write a reachability bitmap index as part of the repack. This Write a reachability bitmap index as part of the repack. This
only makes sense when used with `-a` or `-A`, as the bitmaps only makes sense when used with `-a` or `-A`, as the bitmaps
must be able to refer to all reachable objects. This option must be able to refer to all reachable objects. This option
overrides the setting of `pack.writeBitmaps`. overrides the setting of `repack.writeBitmaps`. This option
has no effect if multiple packfiles are created.
--pack-kept-objects:: --pack-kept-objects::
Include objects in `.keep` files when repacking. Note that we Include objects in `.keep` files when repacking. Note that we
@ -123,7 +125,7 @@ other objects in that pack they already have locally.
This means that we may duplicate objects, but this makes the This means that we may duplicate objects, but this makes the
option safe to use when there are concurrent pushes or fetches. option safe to use when there are concurrent pushes or fetches.
This option is generally only useful if you are writing bitmaps This option is generally only useful if you are writing bitmaps
with `-b` or `pack.writeBitmaps`, as it ensures that the with `-b` or `repack.writeBitmaps`, as it ensures that the
bitmapped packfile has the necessary objects. bitmapped packfile has the necessary objects.
Configuration Configuration

9
builtin/pack-objects.c
View File

@ -759,6 +759,10 @@ static off_t write_reused_pack(struct sha1file *f)
return reuse_packfile_offset - sizeof(struct pack_header); return reuse_packfile_offset - sizeof(struct pack_header);
} }
static const char no_split_warning[] = N_(
"disabling bitmap writing, packs are split due to pack.packSizeLimit"
);
static void write_pack_file(void) static void write_pack_file(void)
{ {
uint32_t i = 0, j; uint32_t i = 0, j;
@ -813,7 +817,10 @@ static void write_pack_file(void)
fixup_pack_header_footer(fd, sha1, pack_tmp_name, fixup_pack_header_footer(fd, sha1, pack_tmp_name,
nr_written, sha1, offset); nr_written, sha1, offset);
close(fd); close(fd);
write_bitmap_index = 0; if (write_bitmap_index) {
warning(_(no_split_warning));
write_bitmap_index = 0;
}
} }
if (!pack_to_stdout) { if (!pack_to_stdout) {