Skip to content

ACTION REQUIRED: Default branch name change #1404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sudoforge opened this issue May 9, 2025 · 14 comments
Open

ACTION REQUIRED: Default branch name change #1404

sudoforge opened this issue May 9, 2025 · 14 comments
Labels
area/meta/config Relates to repository configuration kind/feature Relates to a new feature

Comments

@sudoforge
Copy link
Contributor

sudoforge commented May 9, 2025

On May 31 2025 at approximately 17:00 UTC, the default branch for the git-bug repository will be changed from master to trunk.

Why is this being done?

The current default branch name is outdated and has negative connotations.

Why "trunk"?

trunk has history -- it is the traditional name for the primary development line in other version control systems like Subversion and CVS. It also aligns well with git's metaphors for "branches" and "trees" -- trunk feels semantically aligned and descriptive of it being the primary/core development line.

It also helps to emphasize a trunk-based development workflow, where branches are short-lived and the aim is to commit to trunk frequently.

What actions do I need to take?

If you have cloned this repository, you'll need to take a few actions in your local copy in order to change the default branch.

1. Rename your local default branch

git branch -m master trunk

2. Set the new default for origin/HEAD

git remote set-head origin trunk

NOTE
If you have a different remote name for this git repository, be sure to reference that instead of origin.

3. Update any scripts or references to the old default branch

Be sure to update any scripts, packages, or other references to the old default branch name.


You can safely perform these migrations today. trunk will be kept up-to-date with the current default tree automatically.

@sudoforge sudoforge added kind/feature Relates to a new feature area/meta/config Relates to repository configuration labels May 9, 2025
@sudoforge sudoforge pinned this issue May 9, 2025
sudoforge added a commit that referenced this issue May 9, 2025
This change introduces a pipeline job called `mirror` that will push to
`refs/heads/trunk` automatically, in order to keep it in sync with the
default tree.

This job is restricted to the SoT for git-bug, and will only execute for
the first run of the workflow.

Refs: #1404
Change-Id: If65f83ce9058dd01aa74f6841dc58ac040284b18
sudoforge added a commit that referenced this issue May 9, 2025
This change introduces a pipeline job called `mirror` that will push to
`refs/heads/trunk` automatically, in order to keep it in sync with the
default tree.

This job is restricted to the SoT for git-bug, and will only execute for
the first run of the workflow.

Refs: #1404
Change-Id: If65f83ce9058dd01aa74f6841dc58ac040284b18
sudoforge added a commit that referenced this issue May 9, 2025
This change introduces a pipeline job called `mirror` that will push to
`refs/heads/trunk` automatically, in order to keep it in sync with the
default tree.

This job is restricted to the SoT for git-bug, and will only execute for
the first run of the workflow.

Refs: #1404
Change-Id: If65f83ce9058dd01aa74f6841dc58ac040284b18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/meta/config Relates to repository configuration kind/feature Relates to a new feature
Projects
None yet
Development

No branches or pull requests

15 participants
@sudoforge and others