[Spice-devel] [PATCH spice-gtk] Update submodules using the --merge option

[Frediano Ziglio]

> 
> Hi
> 
> ----- Original Message -----
> > From: Christophe de Dinechin <dinechin at redhat.com>
> > 
> > By default, subdmodules will be checked out in detached state.
> > This means that you may lose some work in progress.
> 
> Lose is a bit strong here.
> 
> If you have uncommitted changes, submodule update will fail.
> 

This to me seems a good reason for a nack. The update will fail as
a normal conflict without loosing any work.

> If it's committed, it's in your reflog, and in which case you should have
> created a branch for your work.
> 
> > 
> > Using the --merge option will also ensure that if there
> > are conflicts between your current submodule and the
> > version referenced by the parent, you get an opportunity
> > to resolve the conflicts instead of having your changes
> > silently wiped out.
> > 
> > Signed-off-by: Christophe de Dinechin <dinechin at redhat.com>
> > ---
> >  autogen.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/autogen.sh b/autogen.sh
> > index cc7bda3..3fbd5b3 100755
> > --- a/autogen.sh
> > +++ b/autogen.sh
> > @@ -7,7 +7,7 @@ test -z "$srcdir" && srcdir=.
> >  
> >  (
> >      cd "$srcdir"
> > -    git submodule update --init --recursive
> > +    git submodule update --init --recursive --merge
> 
> I would rather use --rebase (to avoid accidental push of those update
> merges).
> 
> >      gtkdocize
> >      autoreconf -v --force --install
> >  )

Frediano