Eric Blake <ebl...@redhat.com> writes: > On 03/26/2015 07:23 AM, Markus Armbruster wrote: >> One more: >> >> [...] >>> diff --git a/tests/qapi-schema/alternate-conflict-string.json >>> b/tests/qapi-schema/alternate-conflict-string.json >>> new file mode 100644 >>> index 0000000..5fd1a47 >>> --- /dev/null >>> +++ b/tests/qapi-schema/alternate-conflict-string.json >>> @@ -0,0 +1,8 @@ >>> +# FIXME: we should reject anonymous unions with multiple >>> string-like branches >>> +{ 'enum': 'Enum', >>> + 'data': [ 'hello', 'world' ] } >>> +{ 'union': 'MyUnion', >>> + 'discriminator': {}, >>> + 'data': { 'one': 'str', >>> + 'two': 'Enum' } } >>> + >> >> /home/armbru/work/qemu/.git/rebase-apply/patch:325: new blank line at EOF. > > Huh. I thought I had git set up to reject me from making commits like > that locally, but obviously not.
There's another one in PATCH 13: /home/armbru/work/qemu/.git/rebase-apply/patch:156: new blank line at EOF. > http://wiki.qemu.org/Contribute/SubmitAPatch should probably mention the > magic one-time setup to use to turn this type of checking on... Feel free to add it :)