Re: git submodule update --merge

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: May 25, 2009, 18:57 UTC
Message-ID: <alpine.DEB.1.00.0905252053070.4288@intel-tinevez-2-302>
In-Reply-To: <7vmy91vxqc.fsf@alter.siamese.dyndns.org>

Hi,

On Mon, 25 May 2009, Junio C Hamano wrote:

Show 8 quoted lines

> Johan Herland <johan@herland.net> writes:
> 
> > I haven't received any replies to my attempt to describe the context 
> > in which "git submodule update --merge" is useful. A hint as to 
> > whether my argument is valid, or just crap, would be nice.
> 
> FWIW, I didn't find "rebase makes sense but merge doesn't" argument very
> convincing to begin with.

Well, that is probably because you are not forced by me to use submodules.

Because in the project I use submodules most heavily, there is one recurring theme: you cannot push to the submodules. And by "you" I mean "a regular user".

So virtually all you do in these submodules cannot be pushed at all. It has to be submitted to the respective submodule maintainer.

And guess what happens in such a case when you set that tentative "update" variable to "merge"?

Exactly.

FWIW I consider any scenario where the average users have push access to the submodule a toy scenario.

The rebase workflow is very useful in my project, so if it does not go into git.git, I'll just force my users to install a Git compiled from my git tree.

Ciao, Dscho