From: Ryan Anderson <ryan@michonline.com>
To: Junio C Hamano <junkio@cox.net>
Cc: Ryan Anderson <ryan@michonline.com>, git@vger.kernel.org
Subject: Re: Annotate another problem report
Date: Mon, 7 Aug 2006 13:19:21 -0700 [thread overview]
Message-ID: <20060807201920.GE15477@h4x0r5.com> (raw)
In-Reply-To: <7vpsfc1fkt.fsf_-_@assigned-by-dhcp.cox.net>
On Mon, Aug 07, 2006 at 01:00:34PM -0700, Junio C Hamano wrote:
> "git annotate Makefile v1.4.0" outputs this:
Known. I think this is related to the merge-parsing bug.
Unfortunately, the only test cases I've found for this involve things
with both a lot of revisions and a lot of lines, so it's a bit hard to
manually see what's going wrong.
> ...
> 58e60dd2 (Nick Hengeveld 2005-11-02 11:19:24 -0800 13)# git.......
> 58e60dd2 (Nick Hengeveld 2005-11-02 11:19:24 -0800 14)# tra.......
> ( 1970-01-01 00:00:00 15)#
> 6d9bbc50 (Patrick Mauritz 2005-09-19 16:11:19 +0200 16)# ..
> 6d9bbc50 (Patrick Mauritz 2005-09-19 16:11:19 +0200 17)# ..
> ...
>
> There are a handful lines it couldn't tell where they came from:
>
> ( 1970-01-01 00:00:00 15)#
> ( 1970-01-01 00:00:00 179)
> ( 1970-01-01 00:00:00 182)
> ( 1970-01-01 00:00:00 274)endif
> ( 1970-01-01 00:00:00 323)
> ( 1970-01-01 00:00:00 384)else
> ( 1970-01-01 00:00:00 385) LIB_4_ICONV =
>
>
--
Ryan Anderson
sometimes Pug Majere
next prev parent reply other threads:[~2006-08-07 20:20 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
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 [this message]
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=20060807201920.GE15477@h4x0r5.com \
--to=ryan@michonline.com \
--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).