correctly adding Help source to local repo

Christian Lohmaier lohmaier at googlemail.com
Tue Oct 24 14:40:21 UTC 2017


Hi Cor, *,

On Sun, Oct 22, 2017 at 9:08 PM, Cor Nouws <oolst at nouenoff.nl> wrote:
>
> I have /git/libreoffice.
>
> Will the command
>   git clone http://anongit.freedesktop.org/git/libreoffice/help.git
> my_directory  (1)
> correctly add the Help to the current repo?

Short answer: no
In addition to what Eike wrote:
We also have git bundles that help with flaky/slow downloads (as those
can be resumed).

http://dev-www.libreoffice.org/bundles/

There's also a helper script to get and integrate those bundles into a
proper tree (aka registers them as submodules)

https://cgit.freedesktop.org/libreoffice/contrib/dev-tools/tree/lo-submodules-from-bundles.sh

mainly useful if you don't even have the core repo yet, but you might
also want to consider it for the translations repo.

so regular git way (this is also what the build would do if you
configure it to use helpcontent):
from your core checkout:

git submodule update --init helpcontent2

→ will clone the helpcontent repo and properly register it as
submodule (so switching branches/commits will also properly switch to
the matching commit in help) - old versions of git however registered
absolute paths, so you couldn't simply move your core checkout to
another location without adjusting paths, but this bug should be fixed
since quite a while now.
FYI: repository data for submodules will be in core-repo's
.git/modules/nameofsubmodule

For sake of completeness manual way if you already got the checkout,
do as the script does (move help's .git dir accordingly and instead
make it a file pointing to it in the parent's repo:
core-repo$ cat helpcontent2/.git
gitdir: ../.git/modules/helpcontent2
and add worktree to .git/modules/helpcontent2/config (worktree =
../../../helpcontent2)
– Or just use the helper script to do it.


ciao
Christian


More information about the LibreOffice mailing list