Skip to content

Commit f451960

Browse files
Denton-Lgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4f0ba2d commit f451960

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

Documentation/git-cat-file.txt

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ object, with placeholders of the form `%(atom)` expanded, followed by a
200200
newline. The available atoms are:
201201

202202
`objectname`::
203-
The 40-hex object name of the object.
203+
The full hex representation of the object name.
204204

205205
`objecttype`::
206206
The type of the object (the same as `cat-file -t` reports).
@@ -215,8 +215,9 @@ newline. The available atoms are:
215215

216216
`deltabase`::
217217
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.
220221

221222
`rest`::
222223
If this atom is used in the output string, input lines are split
@@ -235,14 +236,14 @@ newline.
235236
For example, `--batch` without a custom format would produce:
236237

237238
------------
238-
<sha1> SP <type> SP <size> LF
239+
<oid> SP <type> SP <size> LF
239240
<contents> LF
240241
------------
241242

242243
Whereas `--batch-check='%(objectname) %(objecttype)'` would produce:
243244

244245
------------
245-
<sha1> SP <type> LF
246+
<oid> SP <type> LF
246247
------------
247248

248249
If a name is specified on stdin that cannot be resolved to an object in

0 commit comments

Comments
 (0)