On 01/14/21 02:30, Jiahui Cen wrote:
> Hi Michael,
>
> On 2021/1/13 22:00, Michael S. Tsirkin wrote:
>> On Thu, Jan 07, 2021 at 07:40:37PM +0800, Jiahui Cen wrote:
>>> Commit fe1127da11 ("unit-test: Add the binary file and clear diff.h") does
>>> not
>>> use the up-to-date expected file for pxb for ARM virt.
>>>
>>> Fix the expected DSDT.pxb file.
>>>
>>> Full diff of changed file disassembly:
>>>
>>> diff -ru /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl
>>> /tmp/new/tests/data/acpi/virt/DSDT.pxb.dsl
>>> --- /tmp/old/tests/data/acpi/virt/DSDT.pxb.dsl 2021-01-07
>>> 17:04:51.246831080 +0800
>>
>> This --- sign confuses git am. You shouldn't put this in the commit log
>> really ...
>>
>
> Yes, it does confuse. I found there were some patches with commit log
> like this, so I did the same :(
>
> So, I'll modify the commit logs and resend them.
It's OK to include diffs in the commit message or in the Notes section
of the patch, in general, but such diffs should always be indented, or
quoted in email-style (angle bracket on the left side), covering *all*
parts of the diff (headers, hunk headers, etc).
Laszlo
