[gnutix]

Hunks currently end only when a line starts another state, such as a commit header. That breaks in two ways:

• Custom --pretty formats. With e.g. format.pretty = "Commit: %H%n…", git log -p never prints a line starting with commit , so every commit after the first is drawn as lines of the previous hunk.
• Phantom lines. The blank line git prints between commits (and the input's trailing newline) is drawn as an extra numbered line at the end of each hunk.

This tracks the line counts from each hunk header (@@ -a,n +b,m @@, and the N+1 ranges of combined @@@ headers) and ends the hunk once they are used up. A trailing \ No newline at end of file still belongs to the hunk. The separator before a commit header is kept when the previous hunk ended this way.

Tests

• New case with two commits in a custom pretty format, covering the no-newline marker too.
• Existing snapshots change only by dropping the phantom numbered line at the end of hunks, including in merge-commit cases.

Before, the second commit's header rendered as hunk lines:

    2  - second                       2  + changed second
    2  C ommit:  1111111…             3  C ommit:  1111111…
    3  S ubject: First commit         4  S ubject: First commit

After:

    2  - second                       2  + changed second
Commit:  1111111…
Subject: First commit

🤖 Generated with Claude Code Opus 5.5