Do this while in the core repository:
git submodule update
https://wiki.documentfoundation.org/Development/Submodules
"By default your submodules repository is in a state called 'detached
HEAD'."
So it is not desirable to have helpcontent2 be in branch master.
Ilmari
julien2412 kirjoitti 6.10.2020 klo 22.15:
Hello,
After having recreated from scratch my local repo, I got now:
On branch master
Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git restore <file>..." to discard changes in working directory)
modified: helpcontent2 (new commits)
with:
git diff
diff --git a/helpcontent2 b/helpcontent2
index a9deae83c3b1..5494e02b2527 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit a9deae83c3b11cdb138069b97f3cd6111ff6a19f
+Subproject commit 5494e02b2527f27a8cfbbd0a4a125443f3851715
whereas I got:
julien@debianamd:~/lo/libreoffice$ git branch
* master
julien@debianamd:~/lo/libreoffice/helpcontent2$ git branch
* master
julien@debianamd:~/lo/libreoffice$ git pull -r
load pubkey "/home/julien/.ssh/id_rsa": invalid format
Already up to date.
julien@debianamd:~/lo/libreoffice/helpcontent2$ git status
On branch master
Your branch is up to date with 'origin/master'.
nothing to commit, working tree clean
julien@debianamd:~/lo/libreoffice/helpcontent2$ git pull -r
load pubkey "/home/julien/.ssh/id_rsa": invalid format
Already up to date.
Thanks to gitk, I got extra info:
Local uncommitted changes, not checked in to index
--------------------------------- helpcontent2
---------------------------------
Submodule helpcontent2 a9deae83c3b1..5494e02b2527:
> tdf#96446 Fix Librelogo code example
> Fix duplicate information on AVERAGEIF
> tdf#137196 update help for Format Page tab for all modules
> tdf#133403 update PDF export help pages
> Revise explanation in File - Close help page
> tdf#131305 Add note about shortcut for editing a comment
> tdf#137084 add the More Breaks submenu to Insert help page
> Update DocInformation (field) help page
> Fix Help build
> Workaround for buggy SVG export of image
> tdf#132643 Translate German section IDs
> tdf#132643 Translate German section IDs
...
But I don't know what to do with this.
It's appeared some days ago and I don't know why.
It's not blocking for me but quite annoying.
Any idea?
Julien
--
Sent from: http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice
_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice
