Issue #15843 has been updated by duerst (Martin D=FCrst). For people who haven't yet switched from trunk to master, when you push, yo= u'll get a message saying: ``` remote: @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ remote: @ WARNING: THE TRUNK BRANCH OF RUBY.GIT IS DEPRECATED! @ remote: @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ remote: remote: You pushed commits to 'trunk' branch, but the branch will be delete= d soon. remote: Please delete your local 'trunk' branch, and use the 'master' branc= h instead. ``` Here's an easy way to do this: Check that you have the remote master branch (`remotes/origin/master`) with= `git branch -a`. If you don't, use `git fetch --all` or so to make sure yo= u have it. Then use 'git checkout -b master remotes/origin/master` to creat= e your local master branch. ---------------------------------------- Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org https://bugs.ruby-lang.org/issues/15843#change-82391 * Author: k0kubun (Takashi Kokubun) * Status: Closed * Priority: Normal * Assignee: k0kubun (Takashi Kokubun) ---------------------------------------- ## Background * We're using `trunk` branch as a canonical development branch because it h= as been mirrored to there by git-svn. * In a usual git repository, a HEAD branch is `master` by default. Using `t= runk` instead of `master` is confusing and causes typo on git operations or= typing git-related URLs. * We can make an *alias branch* by using symbolic-ref on `git.ruby-lang.org= :ruby.git`. We can start using `master` branch without disturbing any `trun= k` usage. Why not use it? ## Proposed schedule * 2019 * 5/22: Announce this schedule *(done)* * 5/23: Make `master` symbolic-ref pointing to `trunk` on git.ruby-lang.o= rg *(done)* * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repos= itory) to explicitly use `master` branch instead of `trunk` at ruby-core ma= iling list. *(asked)* * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and rev= erse the symbolic-ref direction (change the default branch of GitHub ruby/r= uby to `master` too) *(done)* * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk re= fs/heads/master && git symbolic-ref refs/heads/trunk refs/heads/master"` * 2020 * 1/1: Drop `trunk` branch on git.ruby-lang.org * `sudo -u git bash -c "cd /var/git/ruby.git && rm refs/heads/trunk"` ### Expected outcome * 2019 * 5/23: * `git push` to `trunk` branch of git.ruby-lang.org will be reflected = to both `trunk` and `master` branches of git.ruby-lang.org immediately. * `git push` to `master` branch of git.ruby-lang.org will also be refl= ected to both `trunk` and `master` branches of git.ruby-lang.org immediatel= y. * Both of `trunk` and `master` branches on GitHub will be always mirro= red. * 7/1: * `git clone` checks out `master` instead of `trunk` by default. * 2020 * 1/1: * `trunk` branch cannot be `git fetch`ed and `git push`ed anymore. -- = https://bugs.ruby-lang.org/ Unsubscribe: <mailto:ruby-core-request / ruby-lang.org?subject=3Dunsubscribe> <http://lists.ruby-lang.org/cgi-bin/mailman/options/ruby-core>