On Tue, Feb 23, 2021 at 1:41 AM Denton Liu <liu.denton@xxxxxxxxx> wrote: > 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@xxxxxxxxx> > --- > diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt > @@ -200,7 +200,7 @@ object, with placeholders of the form `%(atom)` expanded, followed by a > `objectname`:: > - The 40-hex object name of the object. > + The full hex representation of the object. I find this new terminology confusing and ambiguous. To me, this seems to be saying that it is a hex representation of the entire object rather than a hex representation of the hash of the object. Perhaps say either "hex representation of the hash of the object" or "hex representation of the object ID"? > @@ -215,8 +215,8 @@ newline. The available atoms are: > `deltabase`:: > If the object is stored as a delta on-disk, this expands to the > - 40-hex sha1 of the delta base object. Otherwise, expands to the > - null sha1 (40 zeroes). See `CAVEATS` below. > + full hex representation of the delta base object. Otherwise, expands to the > + null OID (all zeroes). See `CAVEATS` below. Same issue. "hex representation of the delta base object" sounds misleading. Should probably mention "hash of the" in there somewhere or something.