Re: [PATCH] diff: skip GITLINK when lazy fetching missing objs

From: Jeff King <peff@peff.net>
Date: Aug 22, 2019, 04:15 UTC
Message-ID: <20190822041529.GA4347@sigill.intra.peff.net>
In-Reply-To: <20190820213924.154253-1-jonathantanmy@google.com>

On Tue, Aug 20, 2019 at 02:39:24PM -0700, Jonathan Tan wrote:

Show 17 quoted lines

> > Jonathan Tan <jonathantanmy@google.com> writes:
> > 
> > > In 7fbbcb21b1 ("diff: batch fetching of missing blobs", 2019-04-08),
> > > diff was taught to batch the fetching of missing objects when operating
> > > on a partial clone, but was not taught to refrain from fetching
> > > GITLINKs. Teach diff to check if an object is a GITLINK before including
> > > it in the set to be fetched.
> > 
> > OK, so in a lazy repository, running "git diff" (or "git log") could
> > have resulted in "git fetch" of a history of a submodule, which may
> > likely have failed?
> 
> Yes - it would attempt to fetch the submodule commit (as stated in the
> GITLINK) from the superproject, which is very unlikely to succeed. (And
> succeeding would allow the operation to continue, but will cause the
> superproject to have unrelated objects in its object store, which is not
> what we want anyway.)

I wondered what would happen when it does not succeed. It looks like the whole diff process just dies.

The batch fetch is purely an optimization, because we'd eventually fetch the individual objects on demand. If the batch one fails, should we continue with the operation? That leaves any error-handling for the overall operation to the "real" code. And it would also mean that this bug became an annoying error message,

But certainly your fix is the right thing to do regardless.

Tangential to your fix, but I also noticed while poking at this that we're pretty aggressive about fetching objects, even if they won't be needed. I know we touched on this briefly when discussing the original patch, and the logic can get pretty complicated, so we punted. But there are a few cases that I think might have a good cost/benefit ratio:

  1. a --raw diff without renames doesn't need the blobs (and even with
     renames, it only needs added/deleted entries). I imagine that being
     able to "git log --raw" on a full history without pulling in a
     bunch of blobs might be worthwhile (and a fairly common operation).

  2. Files that exceed bigFileThreshold or are marked as binary via
     gitattributes will generally be skipped during the file-level diff,
     without even loading them. These are the minority of files, but
     they also have an outsized cost to fetching them (and in fact may
     be the very thing people are trying to avoid with a blob filter).

Again, not anything to hold up your patch, but just cataloging some future work for this area.

-Peff