Re: [PATCH 0/3] batch blob diff generation

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 15, 2024, 02:07 UTC
Message-ID: <xmqqcyhtaecy.fsf@gitster.g>
In-Reply-To: <20241213103850.GA1456983@coredump.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 7 quoted lines

>> Unfortunately the format used in the output from "diff --raw" does
>> not capture this.
>
> Don't we just use the working tree .gitattributes by default, and ignore
> what's in the endpoints? In a bare repo we wouldn't have that, but I
> think the recently added attr.tree and --attr-source options would work
> there.

Yeah, you're right. I forgot about attr.tree (does not seem to be documented, by the way) and --attr-source & GIT_ATTR_SOURCE. I imagine that this feature is primarily meant to be used on the server side, and in bare repositories, only "diff-tree" makes sense among the diff-* family of commands, which (as server environments lack "the index" nor "the working tree") would already be using these mechanisms, so there is no new issues introduced here.

> You can't use attributes from multiple trees in a single request, but I
> doubt that would be a big drawback.

I think it is also true with the normal diff-tree and friends; I do not think it looks up attributes from each tree independently when you run "git diff-tree -r A B" to compare the blob in tree A that is CRLF with the blob at the same path in tree B. So we should be OK.

Thanks.