From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30153 invoked by alias); 28 Jun 2018 14:15:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 30072 invoked by uid 89); 28 Jun 2018 14:15:46 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-15.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,KAM_LOTSOFHASH,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=HContent-Transfer-Encoding:8bit X-HELO: mx1.redhat.com Subject: Re: [PATCH v4] libc: Extend __libc_freeres framework (Bug 23329). To: Carlos O'Donell , GNU C Library , DJ Delorie References: <9666df73-e500-2b2e-e202-a71087bdab91@redhat.com> <2389af1a-a479-0a20-8cb4-034fe0767e5c@redhat.com> <4b89f9db-2d0a-fc61-4f7c-f8903f9c4d14@redhat.com> <22cd6fb5-87ed-ffe1-79ad-d693f44a99f4@redhat.com> From: Florian Weimer Message-ID: <7c2bdd1c-4642-23c2-202a-45fe902e7bb1@redhat.com> Date: Thu, 28 Jun 2018 14:15:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <22cd6fb5-87ed-ffe1-79ad-d693f44a99f4@redhat.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-SW-Source: 2018-06/txt/msg00896.txt.bz2 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