[Geoserver-devel] clean up canonial repo branches

GeoServer GeoServer Developer
1

Hey devs,

there are 94 branches in the canonical geoserver repository.
That doesn’t seem right at all.

We should start by making sure once a PR is merged, it’s branch gets deleted. Especially the ones created by the backports hook, cause almost all other ones should come from branches on people’s forks so each one can do whatever they want with those.

But the backport ones are only 28 out of 94 right now.

May I make a call for each of us to inspect whether we’ve left dangling branches on the main repo and clean them up?

Cheers,

···

Gabriel Roldán

2

Hey devs,

there are 94 branches in the canonical geoserver repository.
That doesn’t seem right at all.

Yes, it’s messy for sure.

We should start by making sure once a PR is merged, it’s branch gets deleted. Especially the ones created by the backports hook, cause almost all other ones should come from branches on people’s forks so each one can do whatever they want with those.

But the backport ones are only 28 out of 94 right now.

May I make a call for each of us to inspect whether we’ve left dangling branches on the main repo and clean them up?

Can you clean up the backport ones, provide a list of the others, with a suggestion about what to do with them?
Maybe you can check which ones have been merged already or which ones look like dead ones

Cheers
Andrea

···

== GeoServer Professional Services from the experts! Visit http://goo.gl/it488V for more information. == Ing. Andrea Aime @geowolf Technical Lead GeoSolutions S.A.S. Via di Montramito 3/A 55054 Massarosa (LU) phone: +39 0584 962313 fax: +39 0584 1660272 mob: +39 339 8844549 http://www.geo-solutions.it http://twitter.com/geosolutions_it ------------------------------------------------------- Con riferimento alla normativa sul trattamento dei dati personali (Reg. UE 2016/679 - Regolamento generale sulla protezione dei dati “GDPR”), si precisa che ogni circostanza inerente alla presente email (il suo contenuto, gli eventuali allegati, etc.) è un dato la cui conoscenza è riservata al/i solo/i destinatario/i indicati dallo scrivente. Se il messaggio Le è giunto per errore, è tenuta/o a cancellarlo, ogni altra operazione è illecita. Le sarei comunque grato se potesse darmene notizia. This email is intended only for the person or entity to which it is addressed and may contain information that is privileged, confidential or otherwise protected from disclosure. We remind that - as provided by European Regulation 2016/679 “GDPR” - copying, dissemination or use of this e-mail or the information herein by anyone other than the intended recipient is prohibited. If you have received this email by mistake, please notify us immediately by telephone or e-mail.

3

Just stumbled into this automation, has anyone experiences with it?
https://help.github.com/en/github/administering-a-repository/managing-the-automatic-deletion-of-branches

Cheers
Andrea

···

GeoServer Professional Services from the experts! Visit http://goo.gl/it488V for more information. == Ing. Andrea Aime @geowolf Technical Lead GeoSolutions S.A.S. Via di Montramito 3/A 55054 Massarosa (LU) phone: +39 0584 962313 fax: +39 0584 1660272 mob: +39 339 8844549 http://www.geo-solutions.it http://twitter.com/geosolutions_it ------------------------------------------------------- Con riferimento alla normativa sul trattamento dei dati personali (Reg. UE 2016/679 - Regolamento generale sulla protezione dei dati “GDPR”), si precisa che ogni circostanza inerente alla presente email (il suo contenuto, gli eventuali allegati, etc.) è un dato la cui conoscenza è riservata al/i solo/i destinatario/i indicati dallo scrivente. Se il messaggio Le è giunto per errore, è tenuta/o a cancellarlo, ogni altra operazione è illecita. Le sarei comunque grato se potesse darmene notizia. This email is intended only for the person or entity to which it is addressed and may contain information that is privileged, confidential or otherwise protected from disclosure. We remind that - as provided by European Regulation 2016/679 “GDPR” - copying, dissemination or use of this e-mail or the information herein by anyone other than the intended recipient is prohibited. If you have received this email by mistake, please notify us immediately by telephone or e-mail.

4

Hi Gabriel, Andrea,
no experience with that automation, but I would say +1.

Just cleaned my dangling branch:

$ git for-each-ref --sort=authorname --format=“%(committerdate) %09 %(authorname) %09 %(refname)” refs/remotes/upstream | grep “Nuno Oliveira”
Thu Oct 3 22:57:07 2019 +0200 Nuno Oliveira refs/remotes/upstream/revert-3778-GEOS-9340

$ git push upstream --delete revert-3778-GEOS-9340
To https://github.com/geoserver/geoserver

  • [deleted] revert-3778-GEOS-9340

Best regards,
Nuno Oliveira

···

Regards,
Nuno Oliveira

GeoServer Professional Services from the experts!
Visit http://goo.gl/it488V for more information.

Nuno Miguel Carvalho Oliveira
@nmcoliveira
Software Engineer

GeoSolutions S.A.S.
Via di Montramito 3/A
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

Con riferimento alla normativa sul trattamento dei dati
personali (Reg. UE 2016/679 - Regolamento generale sulla
protezione dei dati “GDPR”), si precisa che ogni
circostanza inerente alla presente email (il suo contenuto,
gli eventuali allegati, etc.) è un dato la cui conoscenza
è riservata al/i solo/i destinatario/i indicati dallo
scrivente. Se il messaggio Le è giunto per errore, è
tenuta/o a cancellarlo, ogni altra operazione è illecita.
Le sarei comunque grato se potesse darmene notizia.

This email is intended only for the person or entity to
which it is addressed and may contain information that
is privileged, confidential or otherwise protected from
disclosure. We remind that - as provided by European
Regulation 2016/679 “GDPR” - copying, dissemination or
use of this e-mail or the information herein by anyone
other than the intended recipient is prohibited. If you
have received this email by mistake, please notify
us immediately by telephone or e-mail.

5

Hello All,

I haven’t had experience with automatic branch deletion either, but seems like a good idea to me. +1.

It looks like a good chunk of the extra branches seem to be from various large collaborative efforts (e.g. java 11 refactor, ysld). Given that a bunch of those involved some degree of refactoring before being merged, it’s likely they won’t show up as dangling branches

Most of the rest seem to be old PR branches from before “PR’s should be on forks” was included in the contributing guide or enforced.

All that said, I’ve deleted my four dangling branches - thanks for that search command Nuno.

Wed May 10 12:03:02 2017 -0700 Torben Barsballe refs/remotes/upstream/GEOS-8117-cite

Thu Oct 25 16:16:27 2018 -0700 Torben Barsballe refs/remotes/upstream/jdk11

Mon Oct 29 09:30:58 2018 -0700 Torben Barsballe refs/remotes/upstream/jdk11_main_split

Thu Oct 25 12:36:04 2018 -0700 Torben Barsballe refs/remotes/upstream/spring-5.1

Cheers,

Torben

On Sun, Nov 17, 2019 at 3:31 AM Nuno Oliveira GeoSolutions <nuno.oliveira@anonymised.com> wrote:

Hi Gabriel, Andrea,
no experience with that automation, but I would say +1.

Just cleaned my dangling branch:

$ git for-each-ref --sort=authorname --format=“%(committerdate) %09 %(authorname) %09 %(refname)” refs/remotes/upstream | grep “Nuno Oliveira”
Thu Oct 3 22:57:07 2019 +0200 Nuno Oliveira refs/remotes/upstream/revert-3778-GEOS-9340

$ git push upstream --delete revert-3778-GEOS-9340
To https://github.com/geoserver/geoserver

  • [deleted] revert-3778-GEOS-9340

Best regards,
Nuno Oliveira

On Sat, Nov 16, 2019 at 6:51 PM Andrea Aime <andrea.aime@anonymised.com> wrote:

On Sat, Nov 16, 2019 at 7:48 PM Andrea Aime <andrea.aime@anonymised.com> wrote:

We should start by making sure once a PR is merged, it’s branch gets deleted. Especially the ones created by the backports hook, cause almost all other ones should come from branches on people’s forks so each one can do whatever they want with those.

Just stumbled into this automation, has anyone experiences with it?
https://help.github.com/en/github/administering-a-repository/managing-the-automatic-deletion-of-branches

Cheers
Andrea

==

GeoServer Professional Services from the experts! Visit http://goo.gl/it488V for more information. == Ing. Andrea Aime @geowolf Technical Lead GeoSolutions S.A.S. Via di Montramito 3/A 55054 Massarosa (LU) phone: +39 0584 962313 fax: +39 0584 1660272 mob: +39 339 8844549 http://www.geo-solutions.it http://twitter.com/geosolutions_it ------------------------------------------------------- Con riferimento alla normativa sul trattamento dei dati personali (Reg. UE 2016/679 - Regolamento generale sulla protezione dei dati “GDPR”), si precisa che ogni circostanza inerente alla presente email (il suo contenuto, gli eventuali allegati, etc.) è un dato la cui conoscenza è riservata al/i solo/i destinatario/i indicati dallo scrivente. Se il messaggio Le è giunto per errore, è tenuta/o a cancellarlo, ogni altra operazione è illecita. Le sarei comunque grato se potesse darmene notizia. This email is intended only for the person or entity to which it is addressed and may contain information that is privileged, confidential or otherwise protected from disclosure. We remind that - as provided by European Regulation 2016/679 “GDPR” - copying, dissemination or use of this e-mail or the information herein by anyone other than the intended recipient is prohibited. If you have received this email by mistake, please notify us immediately by telephone or e-mail.

Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

–

Regards,
Nuno Oliveira

GeoServer Professional Services from the experts!
Visit http://goo.gl/it488V for more information.

Nuno Miguel Carvalho Oliveira
@nmcoliveira
Software Engineer

GeoSolutions S.A.S.
Via di Montramito 3/A
55054 Massarosa (LU)
Italy
phone: +39 0584 962313
fax: +39 0584 1660272

http://www.geo-solutions.it
http://twitter.com/geosolutions_it

Con riferimento alla normativa sul trattamento dei dati
personali (Reg. UE 2016/679 - Regolamento generale sulla
protezione dei dati “GDPR”), si precisa che ogni
circostanza inerente alla presente email (il suo contenuto,
gli eventuali allegati, etc.) è un dato la cui conoscenza
è riservata al/i solo/i destinatario/i indicati dallo
scrivente. Se il messaggio Le è giunto per errore, è
tenuta/o a cancellarlo, ogni altra operazione è illecita.
Le sarei comunque grato se potesse darmene notizia.

This email is intended only for the person or entity to
which it is addressed and may contain information that
is privileged, confidential or otherwise protected from
disclosure. We remind that - as provided by European
Regulation 2016/679 “GDPR” - copying, dissemination or
use of this e-mail or the information herein by anyone
other than the intended recipient is prohibited. If you
have received this email by mistake, please notify
us immediately by telephone or e-mail.

Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel

6

Thanks Nuno for the command.

I’m gonna start by deleting the following ones that are safe to remove:

···

Gabriel Roldán

7

Here’s a compiled list of all branches whose future is yet to be decided:

https://docs.google.com/spreadsheets/d/1Wg0gqbiXdwyb4lt_52UK4C9qnN6yj20vWRlbzlgpJgY/edit?usp=sharing

I didn’t have time yet to dig deeper into each one to recommend and action though.

I’ve a backup of all the branches before starting this so no worries.

···

Gabriel Roldán