From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103276 invoked by alias); 8 Sep 2018 08:51:21 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 101182 invoked by uid 89); 8 Sep 2018 08:48:55 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: smtp.polymtl.ca Received: from smtp.polymtl.ca (HELO smtp.polymtl.ca) (132.207.4.11) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 08 Sep 2018 08:48:53 +0000 Received: from simark.ca (simark.ca [158.69.221.121]) (authenticated bits=0) by smtp.polymtl.ca (8.14.7/8.14.7) with ESMTP id w888mlkj028875 (version=TLSv1/SSLv3 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Sat, 8 Sep 2018 04:48:52 -0400 Received: by simark.ca (Postfix, from userid 112) id 481AA1E75F; Sat, 8 Sep 2018 04:48:47 -0400 (EDT) Received: from simark.ca (localhost [127.0.0.1]) by simark.ca (Postfix) with ESMTP id E8EDC1E175; Sat, 8 Sep 2018 04:48:45 -0400 (EDT) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Sat, 08 Sep 2018 08:51:00 -0000 From: Simon Marchi To: Weimin Pan Cc: Simon Marchi , gdb-patches@sourceware.org Subject: Re: [PATCH v2 PR gdb/16841] virtual inheritance via typedef cannot find base In-Reply-To: <4864ea95-37cc-a323-c330-7d87aee92dde@oracle.com> References: <1535067835-60808-1-git-send-email-weimin.pan@oracle.com> <4958cf6a-a9ab-9448-0017-a4317d5a09ad@ericsson.com> <4864ea95-37cc-a323-c330-7d87aee92dde@oracle.com> Message-ID: <47401603e039c431cf061c7dc354ce7a@polymtl.ca> X-Sender: simon.marchi@polymtl.ca User-Agent: Roundcube Webmail/1.3.6 X-IsSubscribed: yes X-SW-Source: 2018-09/txt/msg00162.txt.bz2 On 2018-09-08 01:12, Weimin Pan wrote: >> Your patch still has trailing whitespaces. Try to do: >> >> $ git format-patch HEAD^ >> $ git am 0001-virtual-inheritance-via-typedef-cannot-find-base.patch >> >> and make sure you have no message other than >> >> Applying: virtual inheritance via typedef cannot find base > > It's nice to know this "git am" command. Do I use the "git am --abort" > command to > restore my original patch, correct problems, then use another "git am" > command? You shouldn't need to use --abort in this case... In my instructions, I forgot to mention to remove your commit before applying it again (it's expected that applying the same patch twice doesn't work). So it should be: $ git format-patch HEAD^ $ git reset --hard HEAD^ $ git am 0001-virtual-inheritance-via-typedef-cannot-find-base.patch Modifications to the patch can be done by using "git commit --amend", as usual. Thanks! Simon