Re: How should I handle binary file with GIT

From: Nicolas Pitre <nico@cam.org>
Date: Apr 5, 2006, 16:25 UTC
Message-ID: <Pine.LNX.4.64.0604051223510.2550@localhost.localdomain>
In-Reply-To: <20060405155528.GI14625@spearce.org>

On Wed, 5 Apr 2006, Shawn Pearce wrote:

Show 10 quoted lines

> The clearly safe approach is to include the full SHA1 ID of the
> old object the patch was created from and use the xdelta in the
> patch only as a means of transporting a compressed form of the new
> version of the object.  If git-diff starts to export say a base 64
> encoding of the xdelta then it should also include the full SHA1
> ID for binary files, even if --full-index wasn't given.
> 
> git-apply should only apply an xdelta patch to the exact same
> old object.  If the tree currently has a different object at that
> path then reject the patch entirely.

Amen.  Exactly what I just said.

Nicolas