Re: [PULL 00/11] emulated nvme updates and fixes

[Daniel P . Berrangé]

On Thu, Mar 18, 2021 at 01:01:58PM +0100, Klaus Jensen wrote:
> On Mar 18 11:28, Peter Maydell wrote:
> > On Thu, 18 Mar 2021 at 11:27, Klaus Jensen <its@irrelevant.dk> wrote:
> > >
> > > On Mar 18 11:26, Peter Maydell wrote:
> > > > On Tue, 16 Mar 2021 at 21:47, Klaus Jensen <its@irrelevant.dk> wrote:
> > > > Hi. This tag includes a submodule update which is not mentioned
> > > > in the cover letter or listed in the cover letter diffstat:
> > > >
> > > >  roms/opensbi           |    2 +-
> > > >
> > > > so I suspect it was inadvertent. Please fix up and resend.
> > > >
> > >
> > > Oh crap. Sorry!
> > 
> > No worries -- git makes this a very easy mistake to make when
> > doing rebases. That's why I have a check for it in my 'apply
> > a pull request' scripts :-)
> > 
> 
> Out of curiosity, are there any obvious safe guards I can implement
> myself to stop this from happening?

AFAICT, latest versions of git no longer add a submodule when doing
"git add -u". You have to explicitly specify the submodule path
to stage it. So this prevent exactly this kind of accident.

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|