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

Re: Chunk header @@@ counts wrong?

From
Junio C Hamano <gitster@pobox.com>
Date
May 2, 2024, 20:47 UTC
Message-ID
<xmqqfrv0c55p.fsf@gitster.g>
In-Reply-To
<xmqqmsp8c5d3.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
>> * 51 plus-space (new to v1 but already in v2) lines
>
> I think you failed to count three lines in v2 and merge result, they
> look like "<<< HEAD" "======" ">>> 8eec118"; new to v1 but already
> in v2 lines are 54, not 51, no?

Ah, I take that back. These have ++ that are new relative to parent #1 and parent #2 (i.e. only the tentative merge result has them). So, yes, I think you are counting correctly.

Sorry, but I do not know what's counting the hunk length numbers in today's code offhand, so I won't be digging it further for now.

Previous: Junio C Hamano
Message 3 of 3 in “Chunk header @@@ counts wrong?”
  1. Johan WallesMay 2, 2024
  2. Junio C HamanoMay 2, 2024
  3. Junio C HamanoMay 2, 2024

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.