diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:27 -0800 |
| commit | cba595ab1a7764aecfde2e8e59994f89b2cd2f2e (patch) | |
| tree | 832b23d5963d8931796fc3b9951e3708d1a40207 /Documentation | |
| parent | 96e6547c2e4c137222c01582b52c0c974a02fd63 (diff) | |
| parent | 01f8d5948a7f370c42d9fe2deb724139a1bfcb7b (diff) | |
| download | git-cba595ab1a7764aecfde2e8e59994f89b2cd2f2e.tar.xz | |
Merge branch 'jk/loose-object-cache-oid'
Code clean-up.
* jk/loose-object-cache-oid:
prefer "hash mismatch" to "sha1 mismatch"
sha1-file: avoid "sha1 file" for generic use in messages
sha1-file: prefer "loose object file" to "sha1 file" in messages
sha1-file: drop has_sha1_file()
convert has_sha1_file() callers to has_object_file()
sha1-file: convert pass-through functions to object_id
sha1-file: modernize loose header/stream functions
sha1-file: modernize loose object file functions
http: use struct object_id instead of bare sha1
update comment references to sha1_object_info()
sha1-file: fix outdated sha1 comment references
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-fsck.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt index ab9a93fb9b..55950d9eea 100644 --- a/Documentation/git-fsck.txt +++ b/Documentation/git-fsck.txt @@ -140,9 +140,9 @@ dangling <type> <object>:: The <type> object <object>, is present in the database but never 'directly' used. A dangling commit could be a root node. -sha1 mismatch <object>:: - The database has an object who's sha1 doesn't match the - database value. +hash mismatch <object>:: + The database has an object whose hash doesn't match the + object database value. This indicates a serious data integrity problem. Environment Variables |