git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Stefan Beller <sbeller@google.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git <git@vger.kernel.org>, Jeff King <peff@peff.net>,
	Eric Sunshine <sunshine@sunshineco.com>,
	Duy Nguyen <pclouds@gmail.com>
Subject: Re: [PATCH 06/14] packfile: express constants in terms of the_hash_algo
Date: Mon, 8 Oct 2018 15:59:36 -0700	[thread overview]
Message-ID: <CAGZ79kbirX6i+qkig6R1YOAsv=0BirhAVkar+AdBLyHgkrXYyg@mail.gmail.com> (raw)
In-Reply-To: <20181008215701.779099-7-sandals@crustytoothpaste.net>

On Mon, Oct 8, 2018 at 2:57 PM brian m. carlson
<sandals@crustytoothpaste.net> wrote:
>
> Replace uses of GIT_SHA1_RAWSZ with references to the_hash_algo to avoid
> dependence on a particular hash length.

Unlike the previous patches, this is dealing directly with packfiles,
which (I would think) carry their own hash function selector?
(i.e. packfiles up to version 4 are sha1 hardcoded and version
5 and onwards will have a hash type field. Usually that hash type would
match what is in the_repository, but you could obtain packfiles
out of band, or the translation table that we plan to have might
be part of the packfile/idx file?)


>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
>  packfile.c | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/packfile.c b/packfile.c
> index 841b36182f..17f993b5bf 100644
> --- a/packfile.c
> +++ b/packfile.c
> @@ -1121,13 +1121,14 @@ int unpack_object_header(struct packed_git *p,
>  void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1)
>  {
>         unsigned i;
> +       const unsigned hashsz = the_hash_algo->rawsz;
>         for (i = 0; i < p->num_bad_objects; i++)
> -               if (hasheq(sha1, p->bad_object_sha1 + GIT_SHA1_RAWSZ * i))
> +               if (hasheq(sha1, p->bad_object_sha1 + hashsz * i))
>                         return;
>         p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
>                                       st_mult(GIT_MAX_RAWSZ,
>                                               st_add(p->num_bad_objects, 1)));
> -       hashcpy(p->bad_object_sha1 + GIT_SHA1_RAWSZ * p->num_bad_objects, sha1);
> +       hashcpy(p->bad_object_sha1 + hashsz * p->num_bad_objects, sha1);
>         p->num_bad_objects++;
>  }
>

  reply	other threads:[~2018-10-08 22:59 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-08 21:56 [PATCH 00/14] Hash function transition part 15 brian m. carlson
2018-10-08 21:56 ` [PATCH 01/14] pack-bitmap-write: use GIT_MAX_RAWSZ for allocation brian m. carlson
2018-10-08 21:56 ` [PATCH 02/14] builtin/repack: replace hard-coded constant brian m. carlson
2018-10-08 22:27   ` Stefan Beller
2018-10-08 23:01     ` Eric Sunshine
2018-10-09 23:00       ` brian m. carlson
2018-10-08 21:56 ` [PATCH 03/14] builtin/mktree: remove " brian m. carlson
2018-10-08 22:32   ` Stefan Beller
2018-10-08 21:56 ` [PATCH 04/14] builtin/fetch-pack: remove constants with parse_oid_hex brian m. carlson
2018-10-08 21:56 ` [PATCH 05/14] pack-revindex: express constants in terms of the_hash_algo brian m. carlson
2018-10-08 22:44   ` Stefan Beller
2018-10-09 22:26     ` brian m. carlson
2018-10-08 21:56 ` [PATCH 06/14] packfile: " brian m. carlson
2018-10-08 22:59   ` Stefan Beller [this message]
2018-10-09 22:25     ` brian m. carlson
2018-10-09 22:34       ` Stefan Beller
2018-10-09 22:54         ` brian m. carlson
2018-10-08 21:56 ` [PATCH 07/14] refs/packed-backend: express constants using the_hash_algo brian m. carlson
2018-10-08 21:56 ` [PATCH 08/14] upload-pack: express constants in terms of the_hash_algo brian m. carlson
2018-10-08 21:56 ` [PATCH 09/14] transport: use parse_oid_hex instead of a constant brian m. carlson
2018-10-08 21:56 ` [PATCH 10/14] tag: express constant in terms of the_hash_algo brian m. carlson
2018-10-08 21:56 ` [PATCH 11/14] apply: replace hard-coded constants brian m. carlson
2018-10-08 21:56 ` [PATCH 12/14] apply: rename new_sha1_prefix and old_sha1_prefix brian m. carlson
2018-10-08 21:57 ` [PATCH 13/14] submodule: make zero-oid comparison hash function agnostic brian m. carlson
2018-10-08 23:10   ` Stefan Beller
2018-10-08 21:57 ` [PATCH 14/14] rerere: convert to use the_hash_algo brian m. carlson
2018-10-08 23:18   ` Stefan Beller
2018-10-12 13:11   ` [PATCH] object_id.cocci: match only expressions of type 'struct object_id' SZEDER Gábor
2018-10-15  2:34     ` Junio C Hamano
2018-10-15  4:24       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAGZ79kbirX6i+qkig6R1YOAsv=0BirhAVkar+AdBLyHgkrXYyg@mail.gmail.com' \
    --to=sbeller@google.com \
    --cc=git@vger.kernel.org \
    --cc=pclouds@gmail.com \
    --cc=peff@peff.net \
    --cc=sandals@crustytoothpaste.net \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).