ESAPI 'master' branch renamed to 'main' and ESAPI documentation updated accordingly

[Kevin W. Wall]

Matt has just recently completed renaming the 'master' branch as 'main' and I have updated all the documentation in the 'develop' branch that previously referred to 'master' and changed it to 'main' accordingly.

If you were doing something on the your local 'master' branch (which shouldn't be the case as 'develop' has been the default branch name for ESAPI for quite a while and furthermore 'master' [now 'main'] is configured as a "protected" branch in GitHub such that only the ESAPI co-leaders can do pushes to it), then you may need to execute the following 'git' instructions to do a local rename of 'master' to 'main'.

However, if you do not have a local 'master' branch (which should be the case for the majority of you), no further action is anticipated.

Note that most of this information is from https://www.git-tower.com/learn/git/faq/git-rename-master-to-main/ under the section "What Your Teammates Have to Do".

If you have a local "master" branch that you wish to continue working with, consider executing the following 'git' instructions:

# Rename local "master" to "main". NOTE: if you get the error message:
#   error: refname refs/heads/master not found
# you do not have a LOCAL "master" branch and can stop.
$ git branch -m master main

# Get the latest commits (and branches) from the remote:
$ git fetch origin

# Remove the existing tracking connection with "origin/master", if any.
# Note that this step may not be necessary.
$ git branch --unset-upstream origin/master

# Create a new tracking connection with the new "origin/main" branch:
$ git branch -u origin/main main

Again, it is very unlikely you will have to go through the above steps because 'develop' has been the default name of the ESAPI branch for many years now.

-kevin

--

Blog: https://off-the-wall-security.blogspot.com/    | Twitter: @KevinWWall | OWASP ESAPI Project co-lead
NSA: All your crypto bit are belong to us.