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

Re: [BUG] incorrect line numbers reported in git am

From
Junio C Hamano <gitster@pobox.com>
Date
Oct 2, 2019, 19:44 UTC
Message-ID
<xmqqd0ffdj9k.fsf@gitster-ct.c.googlers.com>
In-Reply-To
<20191002184546.GA22174@generichostname>
Denton Liu <liu.denton@gmail.com> writes:
> 	Applying: dir: special case check for the possibility that pathspec is NULL
> 	error: corrupt patch at line 87

This refers to line 87 of the input file, not a line that begins with "@@ -87,count...", doesn't it? If the sender hand edits a patch without correcting the number of lines recorded in the hunk header, the parser may not see the next hunk that begins with "@@" or run out of the input before it reads the required number of lines given the last hunk header.

We might be able to notice when the input file is shorter than the last hunk wants it to be, in which case we should be able to say 'premature end of input at line 87' or something like that.

Previous: Denton LiuNext: Denton Liu
Message 2 of 12 in “[BUG] incorrect line numbers reported in git am”
  1. Denton LiuOct 2, 2019
  2. Junio C HamanoOct 2, 2019
  3. Denton LiuOct 2, 2019
  4. Junio C HamanoOct 2, 2019
  5. Denton LiuOct 2, 2019
  6. Junio C HamanoOct 3, 2019
  7. Duy NguyenOct 3, 2019
  8. Junio C HamanoOct 3, 2019
  9. apply: tell user location of corrupted patch fileDenton Liu, Oct 4, 2019
  10. Junio C HamanoOct 5, 2019
  11. Junio C HamanoOct 5, 2019
  12. Junio C HamanoOct 5, 2019

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.