search

afritz1 / OpenTESArena

Open-source re-implementation of The Elder Scrolls: Arena.
MIT License
915 stars 68 forks source link

Rename default branch from master to main #214

Closed Thunderforge closed 3 years ago

Thunderforge commented 3 years ago

For the last nine months or so, GitHub has made main the default branch instead of master, and other Git hosts have done the same (more info here). Regardless of one's feelings on whether or not the change was necessary, it has become the new industry standard, and I think OpenTESArena should match it.

GitHub provides a simple means to rename the default branch. This will automatically re-target any outstanding PRs to the main branch and will notify contributors to update their local clones (a full list of what it does can be found here).

We will also need to confirm that CI is pointed to the new main branch.

afritz1 commented 3 years ago

Yeah we should do it as long as it doesn't break or otherwise mangle any of the Git history.

Thunderforge commented 3 years ago

It shouldn't break or mangle any of the Git history. I've done this with a few projects using Bitbucket Enterprise, although not on GitHub itself

Since Git branches are technically just pointers to commits, all we're doing is creating a separate branch pointed to the same commit, and then telling GitHub that's the default one.

afritz1 commented 3 years ago

I'd feel more confident about it after I merge my text-rendering-redesign branch, which could be a couple weeks still (don't know for sure). But I like the idea.

Git is a weird name to begin with ("an unpleasant or contemptible person" based on Google), so any improvements in the names of things associated with it are reasonable I think.

Thunderforge commented 3 years ago

Git is a weird name to begin with ("an unpleasant or contemptible person" based on Google)

According to Wikipedia, it was intentional:

Torvalds sarcastically quipped about the name git (which means "unpleasant person" in British English slang): "I'm an egotistical bastard, and I name all my projects after myself. First 'Linux', now 'git'."

abelsromero commented 3 years ago

I've renamed a few projects in GitHub and only issue is CI and any script that uses branch names. About PRs there's no issue, in fact GitHub will notify users with open PRs and take care of repointing them.

afritz1 commented 3 years ago

Should be all done. I verified in GitHub Desktop and my Windows Subsystem for Linux, and am about to on my Raspberry Pi.

On GitHub Desktop, I clicked Fetch then switched from master to main, it did some automatic things while switching, and then I switched to master and deleted it.