Re: git-apply --whitespace (Re: [PATCH 2/5] ACPI, APEI, APEI supporting infrastructure)

Huang Ying
2009-12-31T01:19:38Z

On Thu, 2009-12-31 at 09:14 +0800, Len Brown wrote:
> > diff --git a/drivers/acpi/apei/Kconfig b/drivers/acpi/apei/Kconfig
> > new file mode 100644
> > index 0000000..4085bdd
> > --- /dev/null
> > +++ b/drivers/acpi/apei/Kconfig
> > @@ -0,0 +1,9 @@
> > +config ACPI_APEI
> > + tristate "ACPI Platform Error Interface (APEI)"
> > + depends on X86
> > + help
> > + APEI allows to report errors (for example from the chipset)
> > + to the operating system. This improves NMI handling
> > + especially. In addition it supports error serialization and
> > + error injection.
> > +
> > diff --git a/drivers/acpi/apei/Makefile b/drivers/acpi/apei/Makefile
>
> FYI, git apply considers a trailing blank line,
> such as the one at the end of the hunk above,
> to be a "whitespace error".
>
> I use --whitespace=strip, which causes git to delete it
> upon checkin. However, that causes the 4th patch in
> this series, which appents to this file, to not apply.
>
> Please don't send patches with trailing blank lines.
> In this case, the blank should come as a "preceeding"
> blank line in the 4th patch...

Sorry about that. I will be more careful in next time.

Best Regards,
Huang Ying