How to submit a patch?

Development
1

I have created a patch. It works for me as intended. I have created it with git commit -m “…”and checked with git format-patch origin that it contains what I expect. How do I submit the patch? With LibreOffice I would have done ./logerrit submit master. How to do for CollaboraOffice? I’ve tried with ./cogerrit submit master, but that does not work.

Or could I attach the patch here and someone else will take care of it?

2

Hi @Regina,

Please try ./cogerrit submit main.

1 Like
3

It results in error

ssh: Could not resolve hostname cogerrit: Name or service not known
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.

For LibreOffice there is the instruction https://wiki.documentfoundation.org/Development/gerrit/setup Perhaps something similar is needed to be able to use ./cogerrit?

4

This is a DNS/SSH configuration issue — your system doesn’t know what host cogerrit refers to. Just like the LibreOffice guide sets up a logerrit alias, you need to set up a cogerrit alias pointing to Collabora’s Gerrit server.

Add to your ~/.ssh/config file:

If you haven’t already, you’ll also need to:

  1. Create an account on gerrit.collabora.com (typically via OAuth/GitHub login).
  2. Upload your SSH public key to your Gerrit account settings — go to Settings → SSH Keys and paste the contents of your ~/.pub/id_rsa.pub (or whichever key you use).
  3. Verify the connection with ssh cogerrit — if it’s working, you’ll get a welcome message from Gerrit rather than a “could not resolve hostname” error.

After that, ./cogerrit should be able to reach the remote repository.

5

What do I have to add?

6

For the cogerrit thing, then:

“./cogerrit setup” guides through the process and outputs what you need
at the end, it should be something like:

Host cogerrit gerrit.collaboraoffice.com
IdentityFile ~/.ssh/SOMETHING
User USERID
Port 29418
HostName gerrit.collaboraoffice.com

7

Done. But ./cogerrit test results in

The authenticity of host ‘[gerrit.collaboraoffice.com]:29418 ([46.225.79.241]:29418)’ can’t be established.
ED25519 key fingerprint is: SHA256:RhodxEP7DI0+yMjdvGEagHU3f24usYh4kdeLJYeVC2A
This key is not known by any other names.
Are you sure you want to continue connecting (yes/no/[fingerprint])?

I continued with yes and have got

There seems to be trouble. Please have the output of:
ssh -vvvv cogerrit
at hand when looking for help.

The long output from ssh -vvvv cogerrit contains the text

**** Welcome to Gerrit Code Review ****

Hi regina-henschel, you have successfully connected over SSH.

Unfortunately, interactive shells are disabled.
To clone a hosted Git repository, use:

git clone ssh://regina-henschel@gerrit.collaboraoffice.com:29418/REPOSITORY_NAME.git

Does that mean, that I need to start with this new git clone , apply my patch, create a commit and then use ./cogerrit main? It turned out that ./cogerrit maindoes not work, but the above mentioned ./cogerrit submit main works :slight_smile:

(What is actually needed instead of REPOSITORY_NAME? Found it, has to be core)