[PATCH v4] libc: Extend __libc_freeres framework (Bug 23329).

[Florian Weimer]

On 06/28/2018 04:13 PM, Carlos O'Donell wrote:
> On 06/28/2018 09:44 AM, Florian Weimer wrote:
>> On 06/28/2018 03:35 PM, Carlos O'Donell wrote:
>>> This is the only commit I have on top of master.
>>>
>>> Where are the conflicts?
>>
>> git am cannot construct a common ancestor because it doesn't have a copy of the original file:
>>
>> diff --git a/ChangeLog b/ChangeLog
>> index 1f35f29d77..5f34833c2c 100644
>>
>> Locally, I do not have a blob starting with 1f35f29d77, with master at commit 0b11b6491cc01b5ce5fea1302f8591f25e8c4d80.
> 
> I don't have it either, but git format-patch HEAD~2 still generates it.
> 
> I also have master at 0b11b6491cc01b5ce5fea1302f8591f25e8c4d80.
> 
> I have two local commits on top of HEAD.
> 
> commit ed8f443d30cb0e685a0be38f4587ca84a9e2e846 (HEAD)
> commit d55ec04203058b78de125c8fd1f1762b649f228d
> commit 0b11b6491cc01b5ce5fea1302f8591f25e8c4d80 (origin/master, origin/HEAD)

Hmm, what do “git whatchanged” or “git ls-tree HEAD^ ChangeLog” show?

Florian