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.8 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 84B891F934 for ; Tue, 12 Jan 2021 08:51:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388710AbhALIvJ (ORCPT ); Tue, 12 Jan 2021 03:51:09 -0500 Received: from cloud.peff.net ([104.130.231.41]:53048 "EHLO cloud.peff.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726890AbhALIvI (ORCPT ); Tue, 12 Jan 2021 03:51:08 -0500 Received: (qmail 6054 invoked by uid 109); 12 Jan 2021 08:50:27 -0000 Received: from Unknown (HELO peff.net) (10.0.1.2) by cloud.peff.net (qpsmtpd/0.94) with ESMTP; Tue, 12 Jan 2021 08:50:27 +0000 Authentication-Results: cloud.peff.net; auth=none Received: (qmail 10801 invoked by uid 111); 12 Jan 2021 08:50:29 -0000 Received: from coredump.intra.peff.net (HELO sigill.intra.peff.net) (10.0.0.2) by peff.net (qpsmtpd/0.94) with (TLS_AES_256_GCM_SHA384 encrypted) ESMTPS; Tue, 12 Jan 2021 03:50:29 -0500 Authentication-Results: peff.net; auth=none Date: Tue, 12 Jan 2021 03:50:26 -0500 From: Jeff King To: Taylor Blau Cc: git@vger.kernel.org, jrnieder@gmail.com Subject: Re: [PATCH 04/20] write_reused_pack_verbatim(): convert to new revindex API Message-ID: References: <14b35d01a062f2dfdd710718b659064042dc21d6.1610129796.git.me@ttaylorr.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <14b35d01a062f2dfdd710718b659064042dc21d6.1610129796.git.me@ttaylorr.com> Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Fri, Jan 08, 2021 at 01:16:56PM -0500, Taylor Blau wrote: > diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c > index ea7df9270f..4341bc27b4 100644 > --- a/builtin/pack-objects.c > +++ b/builtin/pack-objects.c > @@ -948,7 +948,7 @@ static size_t write_reused_pack_verbatim(struct hashfile *out, > off_t to_write; > > written = (pos * BITS_IN_EWORD); > - to_write = reuse_packfile->revindex[written].offset > + to_write = pack_pos_to_offset(reuse_packfile, written) > - sizeof(struct pack_header); This one is obviously correct. -Peff