diff options
| author | Jeff King <peff@peff.net> | 2019-01-07 09:40:34 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-08 18:41:06 +0100 |
| commit | 01f8d5948a7f370c42d9fe2deb724139a1bfcb7b (patch) | |
| tree | 796eed07f27c8e12a203463558763320b2e4aeb4 /Documentation | |
| parent | sha1-file: avoid "sha1 file" for generic use in messages (diff) | |
| download | git-01f8d5948a7f370c42d9fe2deb724139a1bfcb7b.tar.xz git-01f8d5948a7f370c42d9fe2deb724139a1bfcb7b.zip | |
prefer "hash mismatch" to "sha1 mismatch"
To future-proof ourselves against a change in the hash, let's use the
more generic "hash mismatch" to refer to integrity problems. Note that
we do advertise this exact string in git-fsck(1). However, the message
itself is marked for translation, meaning we do not expect it to be
machine-readable.
While we're touching that documentation, let's also update it for
grammar and clarity.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 |