Hi, On Tue, Oct 23, 2012 at 11:06:44PM +0200, Michael Stahl wrote: > 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 :-/
What I do is git push origin HEAD:master in the submodule _followed_ by git push in core. I admit it could be a bit easier, but I find it good enough for occasional use. D. _______________________________________________ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
