[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

[Michael Stahl]

On 23/10/12 22:13, Ivan Timofeev wrote:
> On 23.10.2012 23:43, Michael Stahl wrote:
>> On 23/10/12 21:28, Ivan Timofeev wrote:
>>> On 23.10.2012 22:45, Libreoffice Gerrit user wrote:

>>> $ git submodule update
>>> fatal: reference is not a tree: c918f1d4242d9fd9a8de284e6b32b8c00e59debe
>>> Unable to checkout 'c918f1d4242d9fd9a8de284e6b32b8c00e59debe' in
>>> submodule path 'dictionaries'
>>>
>>> what does that mean?
>>
>> it means i should RTFM more and rely less on git to do the right thing,
>> which is apparently beyond its abilities :)
>>
>> pushed that c918f1d4242d9fd9a8de284e6b32b8c00e59debe manually now...
> 
> thanks! Yeah, git behaves strange here... I've found git push
> --recurse-submodules=<check|on-demand>, so git is smart enough, just
> unconcerned.

thanks, that sounds useful; didn't work for me at first because those
submodules are on a detached head, not the master branch... after
fooling around with git rebase i got my commit on the master branch...

then i tried:

git push --recurse-submodules=on-demand --dry-run

which apparently helpfully already pushed the dictionaries submodule
onto the server, _despite_ the --dry-run :-/