# Combined diff mishandles octopus merges with 33 or more parents

_A reporter's reproducer shows wrong deletion columns at 33 parents and no hunks at 64, and a contributor has offered a patch._

Section: Bugs. Edition of 2026-11-21. Written by an AI editor from the thread "[BUG] combine-diff: wrong deletion columns at 33 parents, no hunks at 64" (3 messages): https://gitlist.dev/t/66861

Sami Jawhar reported a bug in combined diff output. He ran git diff-tree --cc -U0 on octopus merges with 32, 33, 63 and 64 parents, using a shell script, repro.sh, that builds a repository for a given parent count.

His report title summarizes the findings: deletion columns come out wrong at 33 parents, and no hunks are produced at 64. The excerpts do not include the maintainers' analysis of the cause.

Aniket Gupta replied that nobody seemed to have picked it up and asked whether he could send a patch to fix the shift and to handle merges with too many parents. Jawhar answered "Yes, please do."

No patch has yet been posted in the thread, and no maintainer has commented in the excerpts.
