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

Re: bug with .gitattributes diff and embedded NUL

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 19, 2007, 06:40 UTC
Message-ID
<7vve6vw5kg.fsf@gitster.siamese.dyndns.org>
In-Reply-To
<4768A70F.8020904@byu.net>
Eric Blake <ebb9@byu.net> writes:
> Looking closer at .dotest/0001, the diff is indeed invalid, containing the
> single line

That is not a bug in diff but actually in bug in non-merge form of rebase, which reuses "format patch as if we are sending it out in e-mail, and apply that on top of a different commit as if we are accepting that e-mail" machinery. That dataflow loses NUL. Fixing rebase not to reuse the e-mailed patch dataflow is on my to-do list, but has been slipping.

So, no, I do not think GIT_EXTERNAL_DIFF would help, as the problem is not diff generation.

I think you can use "rebase -m" to work this issue around.
Previous: Eric BlakeNext: Eric Blake
Message 2 of 3 in “bug with .gitattributes diff and embedded NUL”
  1. Eric BlakeDec 19, 2007
  2. Junio C HamanoDec 19, 2007
  3. Eric BlakeDec 19, 2007

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.