qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH] seabios: fix submodule


From: Eduardo Habkost
Subject: Re: [Qemu-devel] [PATCH] seabios: fix submodule
Date: Sat, 23 Jan 2016 11:02:47 -0200
User-agent: Mutt/1.5.23 (2014-03-12)

On Fri, Jan 22, 2016 at 12:02:30PM +0000, Peter Maydell wrote:
> On 22 January 2016 at 10:59, Gerd Hoffmann <address@hidden> wrote:
> > Commit "36f96c4 target-i386: Add support to migrate vcpu's TSC rate"
> > updates roms/seabios, appearently by mistake.  Revert this.
> >
> > Signed-off-by: Gerd Hoffmann <address@hidden>
> > ---
> >  roms/seabios | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/roms/seabios b/roms/seabios
> > index 33fbe13..01a84be 160000
> > --- a/roms/seabios
> > +++ b/roms/seabios
> > @@ -1 +1 @@
> > -Subproject commit 33fbe13a3e2a01e0ba1087a8feed801a0451db21
> > +Subproject commit 01a84bea2d28a19d2405c1ecac4bdef17683cc0c
> > --
> > 1.8.3.1
> 
> Whoops. Unfortunately git can make it easy to accidentally include
> submodule updates in patches or pull requests, and I didn't catch
> this one on applying the pullreq either.
> 
> I've applied this patch to master to correct the error.

Oops! This was my mistake, it probably happened when I was
rebasing and solving conflicts. Sorry.

Does anybody know a way to tell git to never ever try to commit
submodule changes unless explicitly asked to?

-- 
Eduardo



reply via email to

[Prev in Thread] Current Thread [Next in Thread]