Skip to content

Commit fa8e8d5

Browse files
PhilipOakleyttaylorr
authored andcommitted
doc: use 'object database' not ODB or abbreviation
The abbreviation 'ODB' is used in the technical documentation sections for commit-graph and parallel-checkout, along with an 'odb' option in `git-pack-redundant`, without expansion. Use 'object database' in full, in those entries. The text has not been reflowed to keep the changes minimal. While in the glossary for `object` terms, add the common`oid` abbreviation to its entry. Signed-off-by: Philip Oakley <[email protected]> Signed-off-by: Taylor Blau <[email protected]>
1 parent 776ba91 commit fa8e8d5

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Documentation/git-pack-redundant.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ OPTIONS
3434

3535
--alt-odb::
3636
Don't require objects present in packs from alternate object
37-
directories to be present in local packs.
37+
database (odb) directories to be present in local packs.
3838

3939
--verbose::
4040
Outputs some statistics to stderr. Has a small performance penalty.

Documentation/glossary-content.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ This commit is referred to as a "merge commit", or sometimes just a
262262
identified by its <<def_object_name,object name>>. The objects usually
263263
live in `$GIT_DIR/objects/`.
264264

265-
[[def_object_identifier]]object identifier::
265+
[[def_object_identifier]]object identifier (oid)::
266266
Synonym for <<def_object_name,object name>>.
267267

268268
[[def_object_name]]object name::

Documentation/technical/commit-graph.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ There are two main costs here:
1717

1818
The commit-graph file is a supplemental data structure that accelerates
1919
commit graph walks. If a user downgrades or disables the 'core.commitGraph'
20-
config setting, then the existing ODB is sufficient. The file is stored
20+
config setting, then the existing object database is sufficient. The file is stored
2121
as "commit-graph" either in the .git/objects/info directory or in the info
2222
directory of an alternate.
2323

Documentation/technical/parallel-checkout.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Rejected Multi-Threaded Solution
5656

5757
The most "straightforward" implementation would be to spread the set of
5858
to-be-updated cache entries across multiple threads. But due to the
59-
thread-unsafe functions in the ODB code, we would have to use locks to
59+
thread-unsafe functions in the object database code, we would have to use locks to
6060
coordinate the parallel operation. An early prototype of this solution
6161
showed that the multi-threaded checkout would bring performance
6262
improvements over the sequential code, but there was still too much lock

0 commit comments

Comments
 (0)