Project

General

Profile

Gerrit » History » Version 118

neels, 11/03/2020 03:45 PM

1 110 fixeria
h1. Contributing using Gerrit
2 99 fixeria
3 1 zecke
{{>toc}}
4 11 laforge
5 117 laforge
At [[OpenBSC:OsmoDevCon2016]] we discussed problems with our past contribution / patch submission process using mails on the mailing list as well as patchwork.  The result was that we wanted to give Gerrit a try for some time and see if it helps us to have a better process.  We were (and still are) quite happy with it, and over time most Osmocom projects have migrated to using gerrit.
6 1 zecke
7 10 laforge
Gerrit is a review tool that integrates nicely with git and ssh. You can find general information about Gerrit at https://www.gerritcodereview.com/
8 1 zecke
9 10 laforge
The advantages of Gerrit are:
10
* patch submission status is automatically tracked, also with several revisions for a patch set.
11
* patches are build-tested (and possibly even further tested) by jenkins before they are applied
12 108 stsp
* patch submissions not via git send-email but direcly from git
13 10 laforge
14
h2. Osmocom Subprojects using Gerrit
15
16 73 laforge
The majority of Osmocom sub-projects have chosen to use Gerrit for patch review.  In order to check if a given program uses Gerrit, please check the auto-generated list at https://gerrit.osmocom.org/#/admin/projects/
17 1 zecke
18 75 laforge
If the project is listed there, then it uses Gerrit.   If the project is not listed there, please send patches by e-mail to the respective project [[Mailing_Lists]] instead.
19 30 neels
20 1 zecke
h2. Configuring Gerrit/Account
21
22 109 stsp
You will need to sign up at https://gerrit.osmocom.org/login/. If you have an Osmocom Redmine account you can use https://osmocom.org/openid as OpenID provider.
23 1 zecke
24 109 stsp
* first sign in on https://osmocom.org. Do this before logging into gerrit (the redmine login process loses the gerrit login data and you'd have to do the same thing twice if not logged in on osmocom.org already).
25 55 neels
* go to https://gerrit.osmocom.org and click the "Sign in" link.
26 68 neels
* click the "Sign in with Osmocom":https://gerrit.osmocom.org/login/%23%2Fq%2Fstatus%3Aopen?id=https://osmocom.org/openid link (can be bookmarked). -- This is the same as entering https://osmocom.org/openid as OpenID provider and hitting the "Sign in" button.
27 61 neels
28 109 stsp
*careful:* enter 'https' to ensure that your openid credentials are passed on encrypted.
29 68 neels
*pitfall:* if you're logged in on 'projects.osmocom.org' (including the 'projects.' part), you should also use the openid provider: https://projects.osmocom.org/openid; the 'projects.' part may be omitted, what's important is that redmine login and OpenID URLs match. Also, decide for one of those URLs once, because when picking a different OpenID URL next time, you will create a new user instead of logging in as yourself.
30 61 neels
*note:* gerrit will create a distinct user for each openid URL you pass. If you logged in successfully but your user seems to have lost permissions, you may have created an evil twin user: contact us on the mailing list so we can fix it in the user database.
31 54 neels
32
If you have no Osmocom redmine account, you can simply create one online at the "Register" link in the upper right corner.
33 10 laforge
Even without an existing or new redmine account, you should also be able to use any other OpenID provider to authenticate against gerrit (untested).
34
35
After the initial sign-up you will need to:
36 1 zecke
37 109 stsp
* Pick a username (cannot be changed)
38 1 zecke
* Add your public ssh key(s)
39
* Add email addresses you intend to use as author/comitter
40 30 neels
41
If you would like to push private branches to the Gerrit repository, you also need to be added to the "known users" group.
42
Please send a short requesting email to openbsc@lists.osmocom.org.
43 1 zecke
44
h2. Setting up Gerrit for commits and pushing
45
46 33 neels
*Note:* it is easiest to work with gerrit when gerrit is the only remote in your git clone.
47
When you clone from git.osmocom.org and add the gerrit remote, git will have two remotes,
48 36 neels
so when you first checkout a branch you have to supply the remote explicitly (cumbersome).
49 34 neels
The gerrit repositories and git.osmocom.org are constantly synced, so it is sufficient
50
to clone from gerrit only.
51 33 neels
52
h3. Simplest: new clone
53
54 35 neels
* Create a new clone from gerrit
55
* Fetch the commit hook that adds Change-Id to each commit to uniquely identify a commit
56 42 neels
57 33 neels
<pre>
58
git clone ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT.git
59
scp -P 29418 $USERNAME@gerrit.osmocom.org:hooks/commit-msg $PROJECT/.git/hooks/
60
</pre>
61
62
h3. SSH config
63
64
In '~/.ssh/config', add these lines:
65
<pre>
66 52 neels
Host go
67 33 neels
Hostname gerrit.osmocom.org
68
Port 29418
69
User $USERNAME
70
</pre>
71 52 neels
('go' means gerrit.osmocom, replace with your favorite shortcut name,
72 33 neels
replace '$USERNAME' with your user name as used on the gerrit website)
73
74
Then you can shorten above commands to
75 1 zecke
<pre>
76 52 neels
git clone ssh://go/$PROJECT.git
77 51 neels
cd $PROJECT
78
scp go:hooks/commit-msg .git/hooks/
79 33 neels
</pre>
80
81 1 zecke
h3. Committer must match
82 46 neels
83 1 zecke
Your email address on gerrit and the email address git places in your
84 46 neels
commits must match, or you will get rejected with an error message like
85 108 stsp
"invalid committer". You can add email addresses on the gerrit web UI.
86 47 neels
87 1 zecke
h3. Add gerrit to an existing clone
88
89
* Add the remote to be able to fetch and push to gerrit
90 46 neels
* Fetch the commit hook that adds Change-Id to each commit to uniquely identify a commit
91 1 zecke
92 46 neels
<pre>
93 1 zecke
USERNAME=gerrit_user_name
94
PROJECT=$(basename $PWD)
95
git remote add gerrit ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT.git
96
scp -P 29418 $USERNAME@gerrit.osmocom.org:hooks/commit-msg .git/hooks/
97
</pre>
98
99
h2. Push for review
100
101
Prerequisites:
102
103
* your user on gerrit has an SSH public key
104
* your patch is committed in your local clone
105
* the commit log message has a Change-Id (see 'commit-msg' hook above, and 'Tips and Tricks' below to add a Change-Id to a commit that lacks one.)
106
107
<pre>
108 115 neels
git push $REMOTE $GITHASH:refs/for/$BRANCH%topic=$TOPIC
109 1 zecke
</pre>
110
111
$REMOTE: from above instructions, that's either 'origin' (cloned from gerrit) or 'gerrit' (if you added a second remote).
112
$GITHASH: the committed patch to push, typically you're on your branch and simply push 'HEAD'.
113
$BRANCH: you will typically intend a patch to go to 'master'.
114 115 neels
%topic=$TOPIC: an optional name you may choose.
115 1 zecke
116 109 stsp
For example, check out the revision or branch that you want to submit for review,
117 1 zecke
i.e. the one where your patch or several patches are committed on top of the current master, then:
118
119
If you cloned directly from gerrit:
120
121
<pre>
122
git push origin HEAD:refs/for/master
123
</pre>
124
125
If you added 'gerrit' as a second remote to an existing clone:
126
127
<pre>
128
git push gerrit HEAD:refs/for/master
129
</pre>
130
131
You can optionally add a topic name with
132
133
<pre>
134 115 neels
git push origin HEAD:refs/for/master%topic=my_topic
135 1 zecke
</pre>
136
137 102 stsp
h2. Voting Rules for merging a patch to master
138 7 neels
139 103 stsp
Please follow these voting rules:
140 44 neels
141 102 stsp
h3. Code Review ("CR")
142 77 neels
143 102 stsp
* Please review patches by others.
144
* Do not vote for your own patches (exceptions below).
145
* Before merging, each patch should receive at least two reviews that approve merging.
146 77 neels
147 102 stsp
When voting, please follow this social contract:
148 77 neels
149 102 stsp
* When you approve, vote CR +1.
150
* If there already is someone else's CR +1, you may also choose to vote CR +2.
151
* If the patch owner sees two or more CR +1, the patch owner may apply to self a CR +2.
152
* Once there is at least one CR +2 and one CR +1 vote, a patch may be merged ("Submit" button), except:
153
** If there are two -1 votes, you should not merge, instead clarify the reason and try to fix it.
154
** If there is a single -1 vote, you may still merge the patch, if you are sure that the opinion of the -1 vote does not carry.
155
* Give the benefit of the doubt to the -1 vote, do not lightheartedly overrule.
156
* If there is a CR -2 vote, the patch will likely never pass review, it marks a fundamental flaw.
157
* Merging a patch ("Submit" button) may be done by a reviewer or by the patch owner,
158
  But if there is any negative vote, rather leave merging up to the patch owner.
159
* If you remove a +1 vote, try to make sure that there are no other CR +2 votes left alone
160
  (to prevent accidental "Submit including parents"). If needed, ping other reviewer / admin on IRC.
161
  But try to vote +1 only when you're sure, hence this situation should be rare.
162
* To prevent merging of your own patch before some issue is resolved, consider marking it Work In Progress.
163
164 104 stsp
h3. Exceptions for Trivial / Urgent Patches
165 102 stsp
166
A patch may receive a direct +2 when:
167
168
* it is very trivial, like a typo fix in a comment or log string, so that it is not worth wasting review time on.
169
* it reverts an earlier change that broke the master builds.
170
171
In these cases, the patch submitter may decide to +2 to self, after careful consideration. This should be rare.
172
173
h3. Verification ("V")
174
175
* For most projects, jenkins takes care of voting V +1 automatically.
176
* If you have actually tried out a patch and verified that it works, you may vote V +1.
177
* A patch owner may vote V +1 to self in a project that has no Jenkins verification job.
178
179
h3. Rationale
180
181
Gerrit allows merging a patch as soon as a CR +2 vote and a V +1 vote are in.
182
For quite some time, we had CR +2 permissions for only very few gatekeeper reviewers.
183
The result was that non-gatekeepers' votes seemed to not matter.
184
185
To encourage more peer review that actually has an effect, we would like to sum up +1 votes.
186
We have tried to apply a summing of votes in Gerrit with automatic enforcing
187
( https://gerrit-review.googlesource.com/Documentation/prolog-cookbook.html#_example_13_1_1_2_code_review )
188
but this had numerous quirks, particularly the issues summary shows wildly mismatching voting status.
189
190
The solution is to agree on a social contract: everyone gets +2 permissions,
191
but you shall only use it when it makes sense. Thanks!
192
193 84 neels
h2. Manage private branches
194 1 zecke
195 84 neels
Use a sub-directory with your name to group your own branches, please.
196 1 zecke
*Note* that you must be a member of the "known users" group, see above.
197
198 85 neels
To share / backup local branches to git.osmocom.org, without starting a code review process on gerrit.osmocom.org, just push them as usual to gerrit.
199 84 neels
200
* Note that the git repository must be cloned from the gerrit SSH URL -- all pushing goes to gerrit ("pushurl" as described below also works).
201
* All private branches are automatically synced to git.osmocom.org in a matter of minutes.
202 1 zecke
* Private branches do not kick off patch sets for review, they are just branches. To kick off review for all patches on your branch, you'd use a 'refs/for/master' URL, as shown in the example below.
203 116 neels
204
*Pitfall*: always include both your name and a topic in a branch name, right from the start. If you first create a branch named "fred", creating branches named "fred/topic" later will cause conflicts in the .git admin tree, because first "fred" was a file, and then becomes a directory. Even if you fix it in your local repository, *all* other git repositories, including those on the build servers, may need manual action to become usable again. One solution is to push a deletion of "fred" and then "git fetch --purge" everywhere else.
205 84 neels
206
The typical transcript for "Fred" developing feature "Kazoo" looks like this:
207
208 1 zecke
<pre>
209 84 neels
# Set up ~/.ssh/config so that 'go' points at gerrit.osmocom.org
210
git clone ssh://go/libosmocore
211
212
cd libosmocore
213
git checkout -b fred/kazoo   # create local branch
214
215
$EDITOR
216
git add kazoo.c
217
git commit -m "implement kazoo"
218
219
# just invoke 'git push' and git tells you how to create the branch once-off:
220 1 zecke
git push
221 84 neels
|fatal: The current branch asdf has no upstream branch.
222
|To push the current branch and set the remote as upstream, use
223
|
224
|    git push --set-upstream origin fred/kazoo
225 1 zecke
226 84 neels
git push --set-upstream origin fred/kazoo
227
# Now the branch exists on gerrit, very soon will also exist on git.osmocom.org
228
229
# Further tweaks
230
$EDITOR
231
git add kazoo.h
232
git commit --amend
233
234
# You are free to force-push private branches
235
git push -f
236
237
# origin/master has changed? Rebase onto the latest.
238
git fetch
239
git rebase -i origin/master
240
# resolve conflicts...
241
git push -f
242
243
# Feature is ready
244
git push origin HEAD:refs/for/master/kazoo
245 39 neels
</pre>
246 7 neels
247 48 ahuemer
h2. List changesets in gerrit
248 2 zecke
249 12 msuraev
<pre>
250 17 neels
git ls-remote gerrit changes/*
251 1 zecke
</pre>
252 80 neels
253
h1. Tips and Tricks
254
255
h2. A commit lacks a Change-Id
256
257
once you added the commit hook as above, just re-edit the commit log message, e.g. with
258
259
<pre>
260
git commit --amend
261
</pre>
262
263
or by
264
265
<pre>
266
git rebase -i
267
</pre>
268
269
and in the upcoming editor replacing 'pick' with 'r' in front of the commit to edit.
270 74 neels
271
No need to change the commit log if you don't want to, just exit the editor and the commit hook will add a Change-Id.
272 79 neels
273 87 msuraev
h2. Ignore WIP patches
274
275
Using following operators in "search" field of web UI allows to ignore Work-in-progress changes:
276
<pre>
277
status:open AND -is:wip
278
</pre>
279
280 79 neels
h2. Fetch fast from git.osmocom.org, push to gerrit
281
282 1 zecke
Gerrit has moved to a faster host, so this should no longer be necessary. Anyway...
283 74 neels
284 109 stsp
Adding a second remote forces you to explicitly pass the remote on the command line ("origin").
285
It is possible to have only one remote for convenience, with different push and pull URLs:
286 79 neels
287 74 neels
<pre>
288 1 zecke
git remote set-url origin git://git.osmocom.org/$PROJECT
289 74 neels
git remote set-url --push origin ssh://$USERNAME@gerrit.osmocom.org:29418/$PROJECT
290
</pre>
291 79 neels
292 74 neels
With above .ssh config you can also use the shorter ssh:// URL:
293
<pre>
294 79 neels
git remote set-url --push origin ssh://go/$PROJECT
295 74 neels
</pre>
296
297
The resulting .git/config in libosmocore would look something like:
298
<pre>
299
[remote "origin"]
300
        url = git://git.osmocom.org/libosmocore
301
        pushurl = ssh://go/libosmocore
302
        fetch = +refs/heads/*:refs/remotes/origin/*
303
</pre>
304 17 neels
305
Now you're fetching from git.osmocom.org, which is lightning fast, while pushing patches will still go to gerrit as usual.
306
307 45 neels
h2. Throw-away branch
308 13 neels
309 56 neels
If you need to adjust and re-submit patches, it may be handy to create a throw-away branch ("R D" in magit-gerrit in emacs for example),
310
make your changes/amendments and then send patch(es) back to gerrit while removing temporary branch automatically with "git review -f".
311
312
h2. Fetch a patch from gerrit
313
314
This script (I called it @P@) makes fetching a patch set from gerrit a breeze:
315
<pre>
316
#!/bin/sh
317
# fetch gerrit patch into new branch named like the patch number.
318
#
319
# Usage: go to a git clone and pass a patch number:
320
#
321
#   cd openbsc
322
#   P 973
323
# or
324
#   P 973/2
325
#
326
# Will create new local branches '973_4' (if 4 is the latest patch set)
327
# or '973_2', respectively.
328
329
patch="$1"
330
331
if [ -z "$patch" ]; then
332
  echo "Usage: P 1234[/5]"
333
  exit 1
334
fi
335
336
if [ -z "$(echo "$patch" | grep '/')" ]; then
337
  patch="/$patch/"
338
fi
339
340
if [ -z "$(echo "$patch" | grep '^/')" ]; then
341
  patch="/$patch"
342
fi
343
344 112 neels
remote="$(git remote get-url --push origin)"
345
346
last_set="$(git ls-remote "$remote" "changes/*" | grep "$patch" | sed 's#.*/\([^/]*\)$#\1 &#' | sort -n | tail -n 1)"
347 56 neels
if [ -z "$last_set" ]; then
348
  echo "Not found: $patch"
349
  exit 1
350
fi
351
352
change_name="$(echo "$last_set" | sed 's/.*\(refs.*\)/\1/')"
353
branch_name="$(echo "$change_name" | sed 's#refs/changes/../\([0-9]*\)/\([0-9]*\)#\1_\2#')"
354 1 zecke
355 56 neels
set -x
356 112 neels
git fetch "$remote" "$change_name"
357 25 neels
git co -b "$branch_name" FETCH_HEAD
358 13 neels
</pre>
359 1 zecke
360 58 neels
h2. Re-submit a Branch with Amended Commits
361
362 22 neels
On a feature branch, one typically has numerous commits that depend on their preceding commits.
363 58 neels
Often, some of the branch commits need to be amended for fixes. You can re-submit changes to
364
patches on your branch by pushing in the same way that you first submitted the branch.
365
366 29 neels
Note: if you modify the Change-Ids in the commit logs, your push would open entirely new
367 58 neels
review entries and you would have to abandon your previous submission. Comments on the first
368
submission are "lost" and you cannot diff between patch sets.
369 29 neels
370 26 neels
371 1 zecke
h2. Re-submit Previously Abandoned Changes
372
373
You have to edit the Change-Ids, on a branch that would be every single commit log message.
374
375
<pre>
376
cd openbsc
377
git co my-branch
378
git rebase -i master
379
# replace all 'pick' with 'r' (or 'reword'), exit your editor
380
# git presents each commit log message for editing
381
</pre>
382
383 78 neels
h2. 502 Bad Gateway
384
385
When getting a "Bad Gateway" error message upon trying to login on gerrit, you probably just need to restart your web browser. The reason is not clear.
386
387
388
h2. Commit hook: Always put Change-Id at the bottom of the log message
389
390
The commit-msg hook places a Change-Id tag in the footer, often above other tags like 'Depends:' or 'Related:'. Since the Change-Id is an implementation detail for Gerrit, I personally prefer it always placed right at the bottom. This simple edit changes the commit-msg hook to add Change-Id at the bottom unconditionally:
391
392
<pre>
393
cd $PROJECT
394
sed -i 's/if (unprinted /if (0 \&\& unprinted /' .git/hooks/commit-msg
395
</pre>
396
397
The goal is to disable the condition in line 163 with an 'if (0...':
398
399
<pre>
400
                        if (0 && unprinted && match(tolower(footer[line]), changeIdAfter) != 1) {
401
                                unprinted = 0
402
                                print "Change-Id: I'"$id"'"
403
                        }
404 60 neels
</pre>
405 16 neels
406 13 neels
Then the Change-Id will be placed by line 170 instead.
407 16 neels
408
h1. Reasons for Particular Configuration
409
410 13 neels
h2. Rebase if necessary
411
412
There are different merge strategies that Gerrit performs to accept patches.
413
Each project can be configured to a specific merge strategy, but unfortunately you can't
414
decide on a strategy per patch submission.
415
416
It seems that the "Merge if Necessary" strategy is best supported, but it creates non-linear
417
history with numerous merge commits that are usually not at all necessary.
418
419
Instead, the "Cherry Pick" strategy puts each patch onto current master's HEAD to create
420 1 zecke
linear history. However, this will cause merge failures as soon as one patch depends on
421 13 neels
another submitted patch, as typical for a feature branch submission.
422
423 1 zecke
So we prefer the "Rebase if Necessary" strategy, which always tries to apply your patches to
424 13 neels
the current master HEAD, in sequence with the previous patches on the same branch.
425
426
h2. Private Branches: Create a new change for every commit...
427 16 neels
428 13 neels
Say you have an extensive feature in development, and you want to keep it on the
429
upstream git repository to a) keep it safe and b) collaborate with other devs on it.
430
So, of course, you have regularly pushed to refs/heads/yoyodyne/feature.
431
432
Since you have the gerrit commit hook installed, your feature branch already has
433
Change-Id tags in all commit log messages.
434
435
Now your feature is complete and you would like to submit it to master.
436 16 neels
Alas, Gerrit refuses to accept your patch submission for master, because it
437
knows the Change-Ids are also on a different branch.
438
439
Gerrit by default enforces that a Change-Id must be unique across all branches,
440
so that each submission for review is separate for each branch. Instead, we
441 13 neels
want to handle Change-Ids per-branch, so that you can have the same change
442 16 neels
submitted to different branches, as separate patch submissions, without having
443
to cosmetically adjust the Change-Id.
444 13 neels
445 20 neels
Solution: set the option 
446 14 neels
_Create a new change for every commit not in the target branch_ to _TRUE_
447
448
h2. Allow content merges
449
450
By default, gerrit compares patches only by the files' paths. If two paths are the same,
451
it immediately shows them as conflicts (path conflicts).
452
453 23 neels
In software development, a conflict usually means an actual content conflict, so if the
454 14 neels
edits are in two entirely separate places in the file, we don't consider this a conflict.
455
456 32 neels
By setting _Allow content merges_ to _TRUE_ in the git project config, we tell Gerrit to
457
perform text merges of the submitted patches and only complain about actual content
458
conflicts, in the usual software engineering sense.
459 72 laforge
460
h1. Admin
461
462
h2. Adding a new repository
463
464 113 osmith
1. create the repository in the Gerrit UI, inherit from "All-Projects"
465
2. a) project does not exist on git.osmocom.org:
466 114 osmith
* create an empty git repository using gitosis on git.osmocom.org
467 113 osmith
468
2. b) project exists on git.osmocom.org:
469
* explicitly add gerrit as a second remote and push all branches/tags from git.osmocom.org to gerrit.
470
471
3. configure a jenkins build testing job for this project (see gerrit-verifications.yml in osmo-ci.git/jobs)
472 92 osmith
473 72 laforge
474 32 neels
git replication to gerrit.osmocom.org is enabled automatically, nothing to be done here.  In case of doubt, try
475
@ssh -p 29418 gerrit.osmocom.org replication start --all --wait@
476
477
h2. Adding users to groups
478
479
Normally, the gerrit UI auto-completes a user name in the edit field. It has happened
480
though that an existing user is not auto-completed, as if it didn't exist. In that case,
481
find out the user ID (seven digit number like 1000123) and just enter that.
482
483
The user ID can be found on the user's "Settings" page, or in the database (s.b.).
484
485
h2. Querying the database directly
486
487
If your user has permission to access the database, you can place SQL queries using the
488 71 neels
'gerrit gsql' commands over ssh:
489
490 1 zecke
<pre>
491 53 neels
ssh go "gerrit gsql -c \"show tables\""
492
ssh go "gerrit gsql -c \"select full_name,account_id from accounts\""
493 1 zecke
</pre>
494
495 71 neels
(see ~/.ssh/config above for the 'go' shortcut)
496
497 62 neels
This seems to be the MySQL dialect.
498
499
The "...\"...\"" quoting allows including single-quotes in the SQL statements.
500
501
h2. Fix evil twin users
502
503 111 laforge
If differing openid URLs have lead to evil twin users shadowing the same email address just without the permissions, we end up with duplicate users showing up in the UI, e.g. when you want to add somebody as a reviewer.
504 1 zecke
505 111 laforge
In past gerrit vesions based on ReviewDB, one could use SQL statements to manipulate the database. However, gerrit has migrated to NoteDB, and hence this access is no longer possible.
506 1 zecke
507 111 laforge
You can find information on how to manipulate users using the REST API at
508
* https://charm.cs.illinois.edu/gerrit/Documentation/rest-api-accounts.html#account-endpoints
509
* https://charm.cs.illinois.edu/gerrit/Documentation/rest-api.html
510 1 zecke
511 111 laforge
You can get a list of identities for one given e-mail address (e.g. @pmaier@sysmocom.de@) using
512
513
 curl 'https://gerrit.osmocom.org/accounts/?q=pmaier@sysmocom.de'
514
515
which would give you a result like this:
516
<pre>
517
[
518
  {
519
    "_account_id": 1000028
520
  },
521
  {
522
    "_account_id": 1000140
523
  }
524
]
525 62 neels
</pre>
526 111 laforge
527
528
And subsequetly check which of the identities you want to keep or remove:
529
530
 curl --user http_user:http_pass  'https://gerrit.osmocom.org/a/accounts/1000028/external.ids'
531
curl --user http_user:http_pass  'https://gerrit.osmocom.org/a/accounts/1000140/external.ids'
532
533
The "intended" ones typically have https://osmocom.org/openid URLs, while the unintended/dupliacte ones have http (not https) or use www.osmocom.org or projects.osmocom.org instead.
534
535
Once you have found the duplicate (in this case 100140), you can deactivate the duplicate using 
536
537
 curl --user http_user:http_pass -X DELETE 'https://gerrit.osmocom.org/a/accounts/1000140/active'
Add picture from clipboard (Maximum size: 48.8 MB)