From: Nicolas Pitre <nico@cam.org>
To: Shawn Pearce <spearce@spearce.org>
Cc: "Randal L. Schwartz" <merlyn@stonehenge.com>,
Jakub Narebski <jnareb@gmail.com>,
git@vger.kernel.org
Subject: Re: How should I handle binary file with GIT
Date: Wed, 05 Apr 2006 12:25:29 -0400 (EDT) [thread overview]
Message-ID: <Pine.LNX.4.64.0604051223510.2550@localhost.localdomain> (raw)
In-Reply-To: <20060405155528.GI14625@spearce.org>
On Wed, 5 Apr 2006, Shawn Pearce wrote:
> 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
next prev parent reply other threads:[~2006-04-05 16:25 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-04-05 7:30 How should I handle binary file with GIT moreau francis
2006-04-05 8:14 ` Junio C Hamano
2006-04-05 12:21 ` moreau francis
2006-04-05 13:25 ` Nicolas Pitre
2006-04-05 13:35 ` moreau francis
2006-04-05 13:06 ` Nicolas Pitre
2006-04-05 13:18 ` moreau francis
2006-04-05 19:23 ` Marco Roeland
2006-04-05 15:11 ` Jakub Narebski
2006-04-05 15:32 ` Nicolas Pitre
2006-04-05 15:37 ` Randal L. Schwartz
2006-04-05 15:55 ` Shawn Pearce
2006-04-05 16:25 ` Nicolas Pitre [this message]
2006-04-05 16:21 ` Nicolas Pitre
2006-04-05 18:34 ` Junio C Hamano
2006-04-05 18:51 ` Randal L. Schwartz
2006-04-05 19:31 ` Nicolas Pitre
2006-04-05 20:20 ` Junio C Hamano
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=Pine.LNX.4.64.0604051223510.2550@localhost.localdomain \
--to=nico@cam.org \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=merlyn@stonehenge.com \
--cc=spearce@spearce.org \
/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