From: Bagas Sanjaya <bagasdotme@gmail.com>
Date: Fri, 20 Aug 2021 09:19:39 GMT
Subject: Re: bugreport: git apply -3 confusing "lacks the necessary blob"
Message-ID: <73a31988-d298-0168-43d5-849f91366d7d@gmail.com>
In-Reply-To: <YR1OszUm08BMAE1N@host1.jankratochvil.net>

On 19/08/21 01.17, Jan Kratochvil wrote:
> reproducer:
> (set -ex;: rm -rf gitgit;mkdir gitgit;cd gitgit;git init;echo a >x;git add x;git commit -am.;git checkout -b b;echo b >x;git commit -am.;git checkout master;echo c >x;git commit -am.;git diff master^..b|grep -v ^index >b.diff;git apply -3 b.diff || cat b.diff)

I can reproduce your issue on latest Git (2.33.0).

It seems like you remove `index` line, which **may** contain blob hash 
information required for three-way merge with git apply -3.

But if you don't remove it when generating patch that way, you will get 
expected conflict when git applying.

-- 
An old man doll... just what I always wanted! - Clara