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

Re: bugreport: git apply -3 confusing "lacks the necessary blob"

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 27, 2021, 17:14 UTC
Message-ID
<xmqqwno6ajy1.fsf@gitster.g>
In-Reply-To
<YSkBg3lBAZ2pxCP2@host1.jankratochvil.net>
Jan Kratochvil <jan@jankratochvil.net> writes:
Show 13 quoted lines
> On Fri, 20 Aug 2021 19:40:12 +0200, Junio C Hamano wrote:
>> But I think Jan is talking about the case where users get a patch
>> that lacks the "index" information out of other people's "diff"
>> implementation and try to "apply -3" without realizing that it is
>> not Git's "diff" output.
>
> For example from Phabricator:
> 	https://reviews.llvm.org/file/data/3ceoc32b3yv43vk3nw4q/PHID-FILE-lfeeh2qu4vrngdcwwudo/D107456.diff
>
>
>> Perhaps something like the attached patch would be a good start.
>
> Do you plan to check it in?

Maybe eventually but not yet. When I say "a good start", it is because it is known to be insufficient. I haven't had a chance to revisit the issue.

Previous: Jan Kratochvil
Message 7 of 7 in “bugreport: git apply -3 confusing "lacks the necessary blob"”
  1. Jan KratochvilAug 18, 2021
  2. Bagas SanjayaAug 20, 2021
  3. Jan KratochvilAug 20, 2021
  4. Junio C HamanoAug 20, 2021
  5. Jan KratochvilAug 20, 2021
  6. Jan KratochvilAug 27, 2021
  7. Junio C HamanoAug 27, 2021

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.