From: Junio C Hamano <gitster@pobox•com>
To: Jan Kratochvil <jan@jankratochvil•net>
Cc: Bagas Sanjaya <bagasdotme@gmail•com>, git@vger•kernel.org
Subject: Re: bugreport: git apply -3 confusing "lacks the necessary blob"
Date: Fri, 27 Aug 2021 10:14:46 -0700 [thread overview]
Message-ID: <xmqqwno6ajy1.fsf@gitster.g> (raw)
In-Reply-To: <YSkBg3lBAZ2pxCP2@host1.jankratochvil.net> (Jan Kratochvil's message of "Fri, 27 Aug 2021 17:15:15 +0200")
Jan Kratochvil <jan@jankratochvil•net> writes:
> 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.
prev parent reply other threads:[~2021-08-27 17:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-18 18:17 bugreport: git apply -3 confusing "lacks the necessary blob" Jan Kratochvil
2021-08-20 9:19 ` Bagas Sanjaya
2021-08-20 9:26 ` Jan Kratochvil
2021-08-20 17:40 ` Junio C Hamano
2021-08-20 18:30 ` Jan Kratochvil
2021-08-27 15:15 ` Jan Kratochvil
2021-08-27 17:14 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwno6ajy1.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=bagasdotme@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=jan@jankratochvil$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox