Help for git in submodules
Olivier Hallot
olivier.hallot at documentfoundation.org
Thu Dec 20 14:04:34 PST 2012
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Hi Norbert
Em 20-12-2012 19:35, Norbert Thiebaud escreveu:
> On Thu, Dec 20, 2012 at 1:58 PM, Olivier Hallot
> <olivier.hallot at documentfoundation.org> wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Hi
>>
>> I followed the instructions in
>> https://wiki.documentfoundation.org/Development/Submodules to update
>> dictionaries.
>>
>> my branch is named "my_branch". Hacks and commit done. However, here is
>> what I get on push:
>>
>> - --------------%<-----------------
>>
>> tdf at olivier-Vostro-3500:~/git/core/dictionaries$ git push origin
>> my_branch:refs/for/master
>> fatal: The remote end hung up unexpectedly
>>
>> - --------------%<-----------------
>>
>> and here is my .git/config
>>
>> - --------------%<-----------------
>>
>> tdf at olivier-Vostro-3500:~/git/core/dictionaries$ cat ../.git/config
>
> that is the git config of your core repo, not dictionaries.
>
> your dictionnary git config is under
>
> ~/git/core/.git/modules/dictionaries/config
>
> or
>
> ~/git/core/dictionaries/.git/config if you have a 'old' git version
>
> It is _that_ config that need to have a proper pushurl= pointing to gerrit
>
> While on the subject. Please _do_ use pushurl=ssh:// and url=git://
> as to not do unnecessary ssh overhead to the server for pull/fetch request...
>
> Norbert
>
I made some progress, but now I get
tdf at olivier-Vostro-3500:~/git/core/dictionaries$ git status
# On branch my_branch
nothing to commit (working directory clean)
tdf at olivier-Vostro-3500:~/git/core/dictionaries$ git push origin
my_branch:refs/for/master
Enter passphrase for key '/home/tdf/.ssh/mykey-fdo':
Counting objects: 17, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 1.41 MiB, done.
Total 9 (delta 7), reused 0 (delta 0)
remote: Resolving deltas: 100% (7/7)
remote: Processing changes: refs: 1, done
remote: ERROR: missing Change-Id in commit message
remote: Suggestion for commit message:
remote: Brazilian spell checker and grammar checker update.
remote:
remote: Version 3.0.0 beta 24
remote:
remote: Change-Id: I7de200e2fde6f17cfa167b371ba6e27ace091d2d
To ssh://ohallot@gerrit.libreoffice.org:29418/dictionaries
! [remote rejected] my_branch -> refs/for/master (missing Change-Id in
commit message)
error: failed to push some refs to
'ssh://ohallot@gerrit.libreoffice.org:29418/dictionaries'
here is my ~/git/core/.git/modules/dictionaries/config
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
worktree = /home/tdf/git/core/dictionaries
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
url = git://gerrit.libreoffice.org/dictionaries
pushurl = ssh://ohallot@gerrit.libreoffice.org:29418/dictionaries
[branch "master"]
remote = origin
merge = refs/heads/master
Thanks for having a look into.
- --
Olivier Hallot
Founder, Board of Directors Member - The Document Foundation
The Document Foundation, Zimmerstr. 69, 10117 Berlin, Germany
Fundação responsável civilmente, de acordo com o direito civil
Detalhes Legais: http://www.documentfoundation.org/imprint
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with undefined - http://www.enigmail.net/
iQEcBAEBAgAGBQJQ04tyAAoJEJp3R7nH3vLxawIH/1W3nS31AJWMUc2s5NrncZRm
xRjO9Ec7ED/RcQz7z7HPVWXb9dLLBriffFAADMX4+2Mqtr0AGLnyny7txD3t+U0v
FfZqt0zLIaYJUM8EMZxk1X5QrXedEzgVW9WKHRWifu49Xfs8ksQJh1Rh5DgkUTqP
HZHmdYQpB1ff58XowDSJjPrZJDGBQ/ZYh9V9kyOzZpzknx+RYcqLsH3Ilvg/4wS8
Tn3qq4RurBCiMomfVVQbU7T1m7TFEvV1QxTVkCTmk0LtvllXQWB3O/Rf9l+TvFwn
P/sO3eqPMpF6ON++mlNpwxr+HKRX3F7sdjUiieyvWO4O/TqpG+qjYp0ItvF7/LQ=
=s3+T
-----END PGP SIGNATURE-----
More information about the LibreOffice
mailing list