No problem with the attachment. I usually use the command "git am --3way --ignore-space-change --keep-cr *.patch". That make the same meaning with your 'am' options if the patch is ok. Compare with your attachment and the patch extract form the email, seems some blank lines is missing.
Thanks, Zhichao > -----Original Message----- > From: Heinrich Schuchardt [mailto:xypron.g...@gmx.de] > Sent: Wednesday, April 10, 2019 12:37 AM > To: Gao, Zhichao <zhichao....@intel.com>; devel@edk2.groups.io; Carsey, > Jaben <jaben.car...@intel.com>; Ni, Ray <ray...@intel.com>; Leif Lindholm > <leif.lindh...@linaro.org> > Cc: Gao, Liming <liming....@intel.com> > Subject: Re: [edk2-devel] [PATCH 1/1] ShellPkg/CommandLib: avoid NULL > derefence and memory leak > > On 4/9/19 7:33 AM, Gao, Zhichao wrote: > > The patch code looks good to me. > > But while I apply this patch, it will shows "error: corrupt patch at line > > 24" > and " error: could not build fake ancestor". Maybe you direct change the > patch file and remove some blank lines. > > For Uefi BdsDxe driver, the variable "PlatfomLang" would be initialize all > > the > time. But maybe other manufacturers may have their own Bds solution and > do not set this variable. This patch makes the Shell app more compatible. > > > > Without the patch warning. > > Reviewed-by: Zhichao Gao <zhichao....@intel.com> > > Hello Zhichao, > > I am not able to reproduce the problem. I resend you the patch as > attachment. > > When applying I had to use --keep-cr: > > git am --keep-cr \ > ../patch/0001-ShellPkg-CommandLib-avoid-NULL-derefence-and-memory- > .patch > > I have found no way neither on Windows nor on Linux to create a patch that > applies without --keep-cr. > > If you still have a problem, please, send me your global and local gitconfig > files, your .gitattributes and indicate on which operating system you are > working with which git version. > > Best regards > > Heinrich -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#38755): https://edk2.groups.io/g/devel/message/38755 Mute This Topic: https://groups.io/mt/30920004/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
