| Message ID | 20220119121439.214821-1-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qapi/block: Cosmetic change in BlockExportType schema | expand |
On Wed, Jan 19, 2022 at 01:14:39PM +0100, Philippe Mathieu-Daudé wrote: > From: Philippe Mathieu-Daude <f4bug@amsat.org> > > From: Philippe Mathieu-Daudé <f4bug@amsat.org> The doubled From: looks odd here. I'll double-check that git doesn't mess up the actual commit once I apply the patch. > > Fix long line introduced in commit bb01ea73110 ("qapi/block: > Restrict vhost-user-blk to CONFIG_VHOST_USER_BLK_SERVER"). > > Suggested-by: Markus Armbruster <armbru@redhat.com> > Acked-by: Markus Armbruster <armbru@redhat.com> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > qapi/block-export.json | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/qapi/block-export.json b/qapi/block-export.json > index f9ce79a974b..f183522d0d2 100644 > --- a/qapi/block-export.json > +++ b/qapi/block-export.json > @@ -278,7 +278,8 @@ > ## > { 'enum': 'BlockExportType', > 'data': [ 'nbd', > - { 'name': 'vhost-user-blk', 'if': 'CONFIG_VHOST_USER_BLK_SERVER' }, > + { 'name': 'vhost-user-blk', > + 'if': 'CONFIG_VHOST_USER_BLK_SERVER' }, > { 'name': 'fuse', 'if': 'CONFIG_FUSE' } ] } Reviewed-by: Eric Blake <eblake@redhat.com> Happy to queue this through my NBD tree (as it is tangentially related...)
On 28/1/22 21:54, Eric Blake wrote: > On Wed, Jan 19, 2022 at 01:14:39PM +0100, Philippe Mathieu-Daudé wrote: >> From: Philippe Mathieu-Daude <f4bug@amsat.org> >> >> From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > The doubled From: looks odd here. I'll double-check that git doesn't > mess up the actual commit once I apply the patch. I played with the git --from option to not appear in the list as '"Philippe Mathieu-Daudé via" <qemu-devel@nongnu.org>': https://lore.kernel.org/qemu-devel/efc5f304-f3d2-ff7b-99a6-673595ff0259@amsat.org/ by using a different sendemail.from (removing the acute in my lastname) to force a correct author.from. git-am should have picked the 2nd form, but I see the 1st in commit 3a8fa0edd1. Just curious, did you had to modify it manually? Anyway, thanks for merging this :) >> >> Fix long line introduced in commit bb01ea73110 ("qapi/block: >> Restrict vhost-user-blk to CONFIG_VHOST_USER_BLK_SERVER"). >> >> Suggested-by: Markus Armbruster <armbru@redhat.com> >> Acked-by: Markus Armbruster <armbru@redhat.com> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> >> --- >> qapi/block-export.json | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-)
On Sun, Jan 30, 2022 at 07:50:41PM +0100, Philippe Mathieu-Daudé wrote: > On 28/1/22 21:54, Eric Blake wrote: > > On Wed, Jan 19, 2022 at 01:14:39PM +0100, Philippe Mathieu-Daudé wrote: > > > From: Philippe Mathieu-Daude <f4bug@amsat.org> 'git am' used this line to insert the authorship... > > > > > > From: Philippe Mathieu-Daudé <f4bug@amsat.org> ...then left this line in the commit body, which I manually deleted, without spotting the difference between the two. > > > > The doubled From: looks odd here. I'll double-check that git doesn't > > mess up the actual commit once I apply the patch. > > I played with the git --from option to not appear in the list as > '"Philippe Mathieu-Daudé via" <qemu-devel@nongnu.org>': > https://lore.kernel.org/qemu-devel/efc5f304-f3d2-ff7b-99a6-673595ff0259@amsat.org/ > by using a different sendemail.from (removing the acute in my > lastname) to force a correct author.from. > git-am should have picked the 2nd form, but I see the 1st in commit > 3a8fa0edd1. Just curious, did you had to modify it manually? Alas, since I managed to overlook the change in the acute (I suppose I'm cursed with having a boring name, so unlike many list participants who are overjoyed by the power of UTF-8 to make self-expression more accurate, I have not had as much experience with thinking about it), my manual edits explain why the merged commit ended up with a less desirable spelling. I apologize for the mishap. Do we need/want a .mailmap entry to aid git at listing your preferred spelling? > > Anyway, thanks for merging this :) And thanks for bearing with developers that are still learning to overcome accidental cultural bias!
On 31/1/22 22:37, Eric Blake wrote: > On Sun, Jan 30, 2022 at 07:50:41PM +0100, Philippe Mathieu-Daudé wrote: >> On 28/1/22 21:54, Eric Blake wrote: >>> On Wed, Jan 19, 2022 at 01:14:39PM +0100, Philippe Mathieu-Daudé wrote: >>>> From: Philippe Mathieu-Daude <f4bug@amsat.org> > > 'git am' used this line to insert the authorship... > >>>> >>>> From: Philippe Mathieu-Daudé <f4bug@amsat.org> > > ...then left this line in the commit body, which I manually deleted, > without spotting the difference between the two. > >>> >>> The doubled From: looks odd here. I'll double-check that git doesn't >>> mess up the actual commit once I apply the patch. >> >> I played with the git --from option to not appear in the list as >> '"Philippe Mathieu-Daudé via" <qemu-devel@nongnu.org>': >> https://lore.kernel.org/qemu-devel/efc5f304-f3d2-ff7b-99a6-673595ff0259@amsat.org/ >> by using a different sendemail.from (removing the acute in my >> lastname) to force a correct author.from. >> git-am should have picked the 2nd form, but I see the 1st in commit >> 3a8fa0edd1. Just curious, did you had to modify it manually? > > Alas, since I managed to overlook the change in the acute (I suppose > I'm cursed with having a boring name, so unlike many list participants > who are overjoyed by the power of UTF-8 to make self-expression more > accurate, I have not had as much experience with thinking about it), > my manual edits explain why the merged commit ended up with a less > desirable spelling. I apologize for the mishap. Do we need/want a > .mailmap entry to aid git at listing your preferred spelling? A missing acute is not a big deal, compared to other alphabets where people try to approximate their name pronunciation to Latin symbols, and is still better than UTF-8 mojibake :)
diff --git a/qapi/block-export.json b/qapi/block-export.json index f9ce79a974b..f183522d0d2 100644 --- a/qapi/block-export.json +++ b/qapi/block-export.json @@ -278,7 +278,8 @@ ## { 'enum': 'BlockExportType', 'data': [ 'nbd', - { 'name': 'vhost-user-blk', 'if': 'CONFIG_VHOST_USER_BLK_SERVER' }, + { 'name': 'vhost-user-blk', + 'if': 'CONFIG_VHOST_USER_BLK_SERVER' }, { 'name': 'fuse', 'if': 'CONFIG_FUSE' } ] } ##