git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git-annotate bug report

From
RARyan Anderson <ryan@michonline.com>
Date
Aug 3, 2006, 21:10 UTC
Message-ID
<20060803211024.GA29529@h4x0r5.com>
In-Reply-To
<20060803203848.GA15121@coredump.intra.peff.net>
On Thu, Aug 03, 2006 at 04:38:48PM -0400, Jeff King wrote:
Show 11 quoted lines
> 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
Previous: Jeff KingNext: Ryan Anderson
Message 2 of 11 in “git-annotate bug report”
  1. Jeff KingAug 3, 2006
  2. Ryan AndersonAug 3, 2006
  3. Ryan AndersonAug 7, 2006
  4. 1/2 log-tree: show_log() should respect the setting of diffopt->line_terminationRyan Anderson, Aug 7, 2006
  5. 2/2 annotate: Fix bug when parsing merges with differing real and logical parents.Ryan Anderson, Aug 7, 2006
  6. Junio C HamanoAug 7, 2006
  7. Ryan AndersonAug 7, 2006
  8. Annotate another problem reportJunio C Hamano, Aug 7, 2006
  9. Ryan AndersonAug 7, 2006
  10. Junio C HamanoAug 7, 2006
  11. Junio C HamanoAug 8, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.