Update references to 'master' branch.

[abidh]

Summary

Replace 'master' with 'main' in instructions on how to create and push patches.

[kristof.beyls]

Thanks for this.
The proposed changes all LGTM.
I did do a grep on the term 'master' in llvm/docs, and found quite a few more uses of 'master', especially in links.
The command I used was: grep -R master llvm/docs/
Just two examples are:

llvm/docs/CodingStandards.rst:<https://github.com/llvm/llvm-project/tree/master/llvm/include/llvm/ADT>`_)
llvm/docs/GitBisecting.rst:being able to reset, do the usual ``git checkout -f master; git reset --hard

Would you also be willing to adapt/fix the URLs pointing to llvm-project in that directory?

Thanks,

Kristof

[abidh]

In D92831#2442243, @kristof.beyls wrote:

Thanks for this.
The proposed changes all LGTM.
I did do a grep on the term 'master' in llvm/docs, and found quite a few more uses of 'master', especially in links.
The command I used was: grep -R master llvm/docs/
Just two examples are:

llvm/docs/CodingStandards.rst:<https://github.com/llvm/llvm-project/tree/master/llvm/include/llvm/ADT>`_)
llvm/docs/GitBisecting.rst:being able to reset, do the usual ``git checkout -f master; git reset --hard

Would you also be willing to adapt/fix the URLs pointing to llvm-project in that directory?

Thanks,

Kristof

Thanks for having a look. I will update the patch as suggested.

[abidh]

Updated other instances in llvm/docs. I have initially updated the whole tree but that becomes quite a big patch. I can post that one if it is of interest.

[kristof.beyls]

llvm/docs/CompileCudaWithLLVM.rst

147 ↗

(On Diff #310704)

For the llvm-test-suite project (rather than the llvm-project project), there is no main branch yet.
So if we'd commit this as is, that would break the link.

@sqlbyme did you have a timeline for when you'd expect to also add a main branch in llvm-test-suite.
If that is expected to happen soon, maybe it's simplest to just wait for that to happen and then commit this patch as a whole?

[abidh]

llvm/docs/CompileCudaWithLLVM.rst

147 ↗

(On Diff #310704)

Thanks for catching this. It was an oversight. I will remove it from the patch as there are other locations which refers https://github.com/llvm/llvm-test-suite which I had not touched. We can update them when they have a main branch of their own.

[abidh]

Remove an unintended change.

[sammccall]

All the changes listed here look good. (I haven't verified there are no others)

[kristof.beyls]

LGTM too, thanks!

[abidh]

Rebase.

llvm/docs/GettingStarted.rst

 
 You'll generally want to make sure your branch has a single commit,
 corresponding to the review you wish to send, up-to-date with the upstream
-``origin/master`` branch, and doesn't contain merges. Once you have that, you
+``origin/main`` branch, and doesn't contain merges. Once you have that, you
 can start `a Phabricator review <Phabricator.html>`_ (or use ``git show`` or
 ``git format-patch`` to output the diff, and attach it to an email message).
 

 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Once a patch is reviewed, you should rebase it, re-test locally, and commit the
-changes to LLVM's master branch. This is done using `git push` if you have the
+changes to LLVM's main branch. This is done using `git push` if you have the
 required access rights. See `committing a change
 <Phabricator.html#committing-a-change>`_ for Phabricator based commits or
 `obtaining commit access <DeveloperPolicy.html#obtaining-commit-access>`_

   # Go to the branch with your accepted commit.
   % git checkout branch-with-change
   # Rebase your change onto the latest commits on Github.
-  % git pull --rebase origin master
+  % git pull --rebase origin main
   # Rerun the appropriate tests if needed.
   % ninja check-$whatever
   # Check that the list of commits about to be pushed is correct.
-  % git log origin/master...HEAD --oneline
+  % git log origin/main...HEAD --oneline
   # Push to Github.
-  % git push origin HEAD:master
+  % git push origin HEAD:main
 
 LLVM currently has a linear-history policy, which means that merge commits are
 not allowed. The `llvm-project` repo on github is configured to reject pushes

llvm/docs/Phabricator.rst

 Committing someone's change from Phabricator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-On a clean Git repository on an up to date ``master`` branch run the
+On a clean Git repository on an up to date ``main`` branch run the
 following (where ``<Revision>`` is the Phabricator review number):
 
 ::

 
 
 This will create a new branch called ``arcpatch-D<Revision>`` based on the
-current ``master`` and will create a commit corresponding to ``D<Revision>`` with a
+current ``main`` and will create a commit corresponding to ``D<Revision>`` with a
 commit message derived from information in the Phabricator review.
 
 Check you are happy with the commit message and amend it if necessary.

 
 ::
 
-  git pull --rebase https://github.com/llvm/llvm-project.git master
+  git pull --rebase https://github.com/llvm/llvm-project.git main
   git show # Ensure the patch looks correct.
   ninja check-$whatever # Rerun the appropriate tests if needed.
-  git push https://github.com/llvm/llvm-project.git HEAD:master
+  git push https://github.com/llvm/llvm-project.git HEAD:main
 
 
 Abandoning a change