git-cat-file.txt: remove references to "sha1"
As part of the hash-transition, git can operate on more than just SHA-1 repositories. Replace "sha1"-specific documentation with hash-agnostic terminology. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Mar 3, 2021 at 01:21 UTC
f4519607087dc4d4bb5a5b3629144f2a164b00ac
1 file changed
+6
-5
Documentation/git-cat-file.txt
+6
-5
@@ -200,7 +200,7 @@ object, with placeholders of the form `%(atom)` expanded, followed by a
200
newline. The available atoms are:
201
202
`objectname`::
203
- The 40-hex object name of the object.
203
+ The full hex representation of the object name.
204
205
`objecttype`::
206
The type of the object (the same as `cat-file -t` reports).
@@ -215,8 +215,9 @@ newline. The available atoms are:
215
216
`deltabase`::
217
If the object is stored as a delta on-disk, this expands to the
218
- 40-hex sha1 of the delta base object. Otherwise, expands to the
219
- null sha1 (40 zeroes). See `CAVEATS` below.
218
+ full hex representation of the delta base object name.
219
+ Otherwise, expands to the null OID (all zeroes). See `CAVEATS`
220
+ below.
221
222
`rest`::
223
If this atom is used in the output string, input lines are split
@@ -235,14 +236,14 @@ newline.
236
For example, `--batch` without a custom format would produce:
237
238
------------
238
-<sha1> SP <type> SP <size> LF
239
+<oid> SP <type> SP <size> LF
240
<contents> LF
241
------------
242
243
Whereas `--batch-check='%(objectname) %(objecttype)'` would produce:
244
245
------------
245
-<sha1> SP <type> LF
246
+<oid> SP <type> LF
247
------------
248
249
If a name is specified on stdin that cannot be resolved to an object in