git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH 02/10] pack-objects: read delta base oid into object_id struct
Date: Tue, 25 Feb 2020 00:19:24 +0000	[thread overview]
Message-ID: <20200225001924.GJ6462@camp.crustytoothpaste.net> (raw)
In-Reply-To: <20200224042944.GB1018190@coredump.intra.peff.net>

[-- Attachment #1: Type: text/plain, Size: 745 bytes --]

On 2020-02-24 at 04:29:44, Jeff King wrote:
> @@ -1707,9 +1702,13 @@ static void check_object(struct object_entry *entry)
>  			unuse_pack(&w_curs);
>  			return;
>  		case OBJ_REF_DELTA:
> -			if (reuse_delta && !entry->preferred_base)
> -				base_ref = use_pack(p, &w_curs,
> -						entry->in_pack_offset + used, NULL);
> +			if (reuse_delta && !entry->preferred_base) {
> +				oidread(&base_ref,
> +					use_pack(p, &w_curs,
> +						 entry->in_pack_offset + used,
> +						 NULL));
> +				have_base = 1;
> +			}

Thanks for using oidread here.  That makes my nascent future series that
adds an algorithm member to struct object_id much easier.
-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 868 bytes --]

  reply	other threads:[~2020-02-25  0:19 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-24  4:26 [PATCH 0/10] removing nth_packed_object_sha1() Jeff King
2020-02-24  4:27 ` [PATCH 01/10] nth_packed_object_oid(): use customary integer return Jeff King
2020-02-24 18:23   ` Jeff King
2020-02-24  4:29 ` [PATCH 02/10] pack-objects: read delta base oid into object_id struct Jeff King
2020-02-25  0:19   ` brian m. carlson [this message]
2020-02-24  4:30 ` [PATCH 03/10] pack-objects: convert oe_set_delta_ext() to use object_id Jeff King
2020-02-24  4:31 ` [PATCH 04/10] pack-objects: use object_id struct in pack-reuse code Jeff King
2020-02-24  4:32 ` [PATCH 05/10] pack-bitmap: use object_id when loading on-disk bitmaps Jeff King
2020-02-24  4:33 ` [PATCH 06/10] pack-check: convert "internal error" die to a BUG() Jeff King
2020-02-24  4:36 ` [PATCH 07/10] pack-check: push oid lookup into loop Jeff King
2020-02-24  4:36 ` [PATCH 08/10] packed_object_info(): use object_id for returning delta base Jeff King
2020-02-24  4:37 ` [PATCH 09/10] packed_object_info(): use object_id internally for " Jeff King
2020-02-24  4:37 ` [PATCH 10/10] packfile: drop nth_packed_object_sha1() Jeff King
2020-02-25  0:33 ` [PATCH 0/10] removing nth_packed_object_sha1() brian m. carlson

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

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

  git send-email \
    --in-reply-to=20200225001924.GJ6462@camp.crustytoothpaste.net \
    --to=sandals@crustytoothpaste.net \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    /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.
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 NNTP newsgroup(s).