Re: [PATCH 09/12] read-cache: abstract away uses of SHA-1

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Jan 28, 2018, 19:50 UTC
Message-ID: <CAPig+cQ6UZJh5sZJURTiZ+T8eV8pyBSMTM8Re-BN7ZVwGc60+A@mail.gmail.com>
In-Reply-To: <20180128155722.880805-10-sandals@crustytoothpaste.net>

On Sun, Jan 28, 2018 at 10:57 AM, brian m. carlson <sandals@crustytoothpaste.net> wrote:

Show 9 quoted lines

> Convert various uses of direct calls to SHA-1 and 20- and 40-based
> constants to use the_hash_algo instead.  Don't yet convert the on-disk
> data structures, which will be handled in a future commit.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> diff --git a/read-cache.c b/read-cache.c
> @@ -2000,26 +2000,26 @@ static int write_index_ext_header(git_SHA_CTX *context, int fd,
>         /* Flush first if not enough space for SHA1 signature */

Did you want to update the comment to remove the SHA1 reference also? (Or was the omission intentional per the commit message?)

Show 8 quoted lines

> -       if (left + 20 > WRITE_BUFFER_SIZE) {
> +       if (left + the_hash_algo->rawsz > WRITE_BUFFER_SIZE) {
>                 if (write_in_full(fd, write_buffer, left) < 0)
>                         return -1;
>                 left = 0;
>         }
>
>         /* Append the SHA1 signature at the end */

Ditto.

Show 6 quoted lines

> -       git_SHA1_Final(write_buffer + left, context);
> -       hashcpy(sha1, write_buffer + left);
> -       left += 20;
> +       the_hash_algo->final_fn(write_buffer + left, context);
> +       hashcpy(hash, write_buffer + left);
> +       left += the_hash_algo->rawsz;