[Libreoffice-commits] .: 5 commits - config_host.mk.in configure.ac ct2n/delzip ct2n/description-en-US.txt ct2n/Extension_ct2n.mk ct2n/Makefile ct2n/makefile.mk ct2n/Module_ct2n.mk ct2n/prj ct2n/UnpackedTarball_ct2n.mk dictionaries Makefile.top nlpsolver/src ooo.lst.in reportbuilder/util RepositoryModule_ooo.mk scripting/source sdext/source solenv/gbuild swext/mediawiki

[Stephan Bergmann]

On 10/24/2012 07:45 AM, David Tardon wrote:
> What I do is
>
> git push origin HEAD:master
>
> in the submodule _followed_ by
>
> git push
>
> in core.

The only annoyance with this, AFAIU, is that as soon as you push the 
submodule to gerrit.libreoffice.org:29418 it automatically creates a 
commit in the core repo on your behalf that updates the submodule SHA 
pointer.

So when you have a core commit A and a submodule commit B that logically 
belong together, with the above recipe the end result on the server will 
no longer reflect that, as it "ties" B to an "artificial" core commit C 
preceding A, instead of keeping B "tied" to A.

Stephan