From: Nicolas Pitre <nico@cam.org>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] count-delta.c: Match the delta data semantics change in version 3.
Date: Fri, 10 Feb 2006 10:20:40 -0500 (EST) [thread overview]
Message-ID: <Pine.LNX.4.64.0602101017420.5397@localhost.localdomain> (raw)
In-Reply-To: <Pine.LNX.4.64.0602092053200.5397@localhost.localdomain>
On Thu, 9 Feb 2006, Nicolas Pitre wrote:
> On Thu, 9 Feb 2006, Junio C Hamano wrote:
>
> > Junio C Hamano <junkio@cox.net> writes:
> >
> > > The bit is however _already_ looked at by the count_delta(),
> > > to assess the extent of damage, IIRC. Should we be
> > > futureproofing that bit as well?
> >
> > Something like this?
>
> Right.
I'm not sure to fully understand what you meant in the comment below.
but if it was related to the removed code, maybe this patch would make
sense:
diff --git a/count-delta.c b/count-delta.c
index 978a60c..058a2aa 100644
--- a/count-delta.c
+++ b/count-delta.c
@@ -16,11 +16,7 @@
*
* Number of bytes that are _not_ copied from the source is deletion,
* and number of inserted literal bytes are addition, so sum of them
- * is the extent of damage. xdelta can express an edit that copies
- * data inside of the destination which originally came from the
- * source. We do not count that in the following routine, so we are
- * undercounting the source material that remains in the final output
- * that way.
+ * is the extent of damage.
*/
int count_delta(void *delta_buf, unsigned long delta_size,
unsigned long *src_copied, unsigned long *literal_added)
next prev parent reply other threads:[~2006-02-10 16:02 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-09 22:50 [PATCH] remove delta-against-self bit Nicolas Pitre
2006-02-09 23:53 ` Junio C Hamano
2006-02-10 1:17 ` [PATCH] count-delta.c: Match the delta data semantics change in version 3 Junio C Hamano
2006-02-10 1:54 ` Nicolas Pitre
2006-02-10 15:20 ` Nicolas Pitre [this message]
2006-02-10 17:19 ` 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.0602101017420.5397@localhost.localdomain \
--to=nico@cam.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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;
as well as URLs for NNTP newsgroup(s).