[GRASS-dev] Switching default branch for grass-addons to grass7

Vaclav Petras wenzeslaus at gmail.com
Wed Jun 30 16:33:17 PDT 2021

Dear all,

The grass7 branch is ready to be used as the default branch for the
grass-addons repo instead of the master branch. (It will later be replaced
by a future grass8 branch in being the default one.)

This is based on several previous discussions on GitHub, by PSC, and here.
See #528 and #571 for more info.


I can change the default branch in the following days. At the same time, I
will also do the catch up in commits needed due to new commits being added
to the master branch (and missing in the grass7 branch).

Further actions needed after the switch:

1) Addon contributors and maintainers, check what is the base branch for
your PRs and change it to grass7. The master branch will become read-only
and the changes there won't get into addons for v8. You can do this anytime.

2) Check g.extension in GRASS versions you need supported. Submit fixes and
workarounds if needed.

3) For new contributions (branches), fetch new branches from upstream (that
is the OSGeo repo) and create your new branches from the grass7 branch
instead of the master branch. From now on, keep updating the grass7 branch
from upsteam, not the master branch. If in doubt, put all your work
elsewhere, double check you did, delete your local clone and your fork, and
start over.

4) Update contributing guides to reflect the changes.

Anticipated adverse effects:

1) Git is good at detecting simple file moves and merging those
automatically, but few touches may be needed. What will be needed is to
merge with the grass7 branch locally as GitHub usually does not allow for
this merge in the web interface.

2) This changes both the default branch and the directory structure.
Workflows and code relying on the default branch will break and will need
to be fixed to either use the legacy master branch or switch to the grass7

Let me know if you have any questions or concerns.

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osgeo.org/pipermail/grass-dev/attachments/20210630/8904b770/attachment.html>

More information about the grass-dev mailing list