From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 1FB151F9FD for ; Tue, 23 Feb 2021 06:51:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231451AbhBWGto (ORCPT ); Tue, 23 Feb 2021 01:49:44 -0500 Received: from mail-ej1-f54.google.com ([209.85.218.54]:40039 "EHLO mail-ej1-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229886AbhBWGtm (ORCPT ); Tue, 23 Feb 2021 01:49:42 -0500 Received: by mail-ej1-f54.google.com with SMTP id u20so32190274ejb.7 for ; Mon, 22 Feb 2021 22:49:26 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=jB/zphZZpmghKexQgRtljqCpmfTF97oFoU+TLvgPM3w=; b=GSOLN/UWVmkDZQ2owJ3Ne713h9g2HaCp6i8Uf/4orix3GELptC7k96Pn8TSofPT0cu ePmBRgXUH8GNQp4XM0LYo4yZsJ3tf3RRqNtn/4PXmNMqMXjI4Iak8FkSciSxHM8z+o5b IHg3h2CniBc/TAFxXueqJR/uZzp44kRN6p4vc+slCzOe4h+PVUOZ7Kvti2vWPRSWysMI kWmA0iqz9R6pB14pMf5tUApOljT762ZrA/6DrF0eAa2o/0g88WSsHQwuU+plxYeJBXLp ZxPhIo9bUTHvRFKjO1/c6WOqt9KM3YEeyoRaJZtRL8WuQcaIznJklhO6wTPveQaVIduP +WoA== X-Gm-Message-State: AOAM532HPQIj829K74RxX65ZtvjhNl+kb4ReugQHlt+Nsqxaw6JYxrXm m9uXkXrGbTtuiw42CqpqBhjC+TxhdrtE7Ua1JGk= X-Google-Smtp-Source: ABdhPJyUd7V8jSIz760jHvEpTLXR4mqQRjMgovuFRcIKxGZu4TZaml0eQgOWGbTkTYX2XWMkw5XQd4rWP/vIVQV4jOE= X-Received: by 2002:a17:906:1fc7:: with SMTP id e7mr16670886ejt.202.1614062940851; Mon, 22 Feb 2021 22:49:00 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Eric Sunshine Date: Tue, 23 Feb 2021 01:48:50 -0500 Message-ID: Subject: Re: [PATCH 3/3] git-cat-file.txt: remove references to "sha1" To: Denton Liu Cc: Git Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Tue, Feb 23, 2021 at 1:41 AM Denton Liu 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 > --- > 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.