From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>, git@vger.kernel.org
Subject: Re: trim_common_tail bug?
Date: Sun, 16 Dec 2007 16:21:04 -0500 [thread overview]
Message-ID: <20071216212104.GA32307@coredump.intra.peff.net> (raw)
In-Reply-To: <7v7ijejq6j.fsf@gitster.siamese.dyndns.org>
On Sun, Dec 16, 2007 at 01:16:36PM -0800, Junio C Hamano wrote:
> > I wanted to recover to the end of the line that includes the cut-off
> > point, even when (ctx == 0), to be extra safer, but I do not think it
> > was necessary.
>
> I have to wonder what happens if the last line which is incomplete has
> more than block bytes that are identical at the end? We need to recover
> the whole thing to show the correct diff, don't we?
No, I think it's right as-is. We forget about the blocks during the
recovery section of the code. IOW, we just keep reading forward until we
find all of the context lines, or we run out of trimmed content. In the
first case, we are fine (we restored the right number of context lines).
In the latter case, we are also fine, because we end up trimming nothing
(IOW, there _weren't_ enough context lines in the first place).
-Peff
next prev parent reply other threads:[~2007-12-16 21:21 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-15 11:16 trim_common_tail bug? Jeff King
2007-12-15 15:51 ` Jeff King
2007-12-15 17:49 ` Junio C Hamano
2007-12-15 20:02 ` Jeff King
2007-12-16 7:06 ` Jeff King
2007-12-16 19:43 ` Junio C Hamano
2007-12-16 21:16 ` Junio C Hamano
2007-12-16 21:21 ` Jeff King [this message]
2007-12-16 21:49 ` [PATCH] Re-re-re-fix common tail optimization Junio C Hamano
2007-12-16 22:15 ` Jeff King
2007-12-16 22:23 ` Junio C Hamano
2007-12-16 22:28 ` Junio C Hamano
2007-12-16 22:29 ` Jeff King
2007-12-17 8:42 ` Wincent Colaiuta
2007-12-17 10:39 ` Johannes Schindelin
2007-12-17 10:59 ` Wincent Colaiuta
2007-12-17 11:57 ` Johannes Schindelin
2007-12-17 12:08 ` Wincent Colaiuta
2007-12-17 12:12 ` Jeff King
2007-12-17 12:20 ` Johannes Sixt
2007-12-17 12:51 ` Johannes Schindelin
2007-12-17 17:58 ` Junio C Hamano
2007-12-17 18:05 ` Johannes Schindelin
2007-12-19 14:18 ` Charles Bailey
2007-12-19 14:27 ` Jeff King
2007-12-19 14:37 ` Charles Bailey
2007-12-20 0:21 ` Junio C Hamano
2007-12-20 1:38 ` Wincent Colaiuta
2007-12-20 9:23 ` Charles Bailey
2007-12-20 9:40 ` 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=20071216212104.GA32307@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).