From: Ryan Anderson <ryan@michonline.com>
To: Jeff King <peff@peff.net>
Cc: ryan@michonline.com, git@vger.kernel.org
Subject: Re: git-annotate bug report
Date: Thu, 3 Aug 2006 14:10:25 -0700 [thread overview]
Message-ID: <20060803211024.GA29529@h4x0r5.com> (raw)
In-Reply-To: <20060803203848.GA15121@coredump.intra.peff.net>
On Thu, Aug 03, 2006 at 04:38:48PM -0400, Jeff King wrote:
> git-annotate on the tip of master seems to be broken for some files (but
> not for others):
>
> $ git-describe
> v1.4.2-rc2-gfba0cbd
> $ make && ./git-annotate builtin-read-tree.c
> parent eff97e3faeb28f6521851c1b3be1a54a2138f12a is on line 852
> Line 852, does not match:
> ||
> | cnt++;|
> 021b6e454944a4fba878651ebf9bfe0a3f6c3077
Sweet, that might be exactly the test case I need to figure out where it
loses track of some lines during merges.
I'll see about looking at this over the weekend.
--
Ryan Anderson
sometimes Pug Majere
next prev parent reply other threads:[~2006-08-03 21:11 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-03 20:38 git-annotate bug report Jeff King
2006-08-03 21:10 ` Ryan Anderson [this message]
2006-08-07 11:50 ` Ryan Anderson
2006-08-07 12:11 ` [PATCH 1/2] log-tree: show_log() should respect the setting of diffopt->line_termination Ryan Anderson
2006-08-07 12:11 ` [PATCH 2/2] annotate: Fix bug when parsing merges with differing real and logical parents Ryan Anderson
2006-08-07 19:16 ` Junio C Hamano
2006-08-07 19:45 ` Ryan Anderson
2006-08-07 20:00 ` Annotate another problem report Junio C Hamano
2006-08-07 20:19 ` Ryan Anderson
2006-08-07 19:38 ` [PATCH 1/2] log-tree: show_log() should respect the setting of diffopt->line_termination Junio C Hamano
2006-08-08 8:49 ` git-annotate bug report 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=20060803211024.GA29529@h4x0r5.com \
--to=ryan@michonline.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.