diff --git headers pack two paths on one space-delimited line, which broke for unquoted paths containing spaces and for git's C-style octal-quoted paths (non-ASCII filenames). Add quote-aware header splitting plus a git unquote helper, and prefer the unambiguous "--- a/"/"+++ b/" lines to correct the file's identity when present.