[ruby-core:92625] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[ruby-core:92625] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been reported by k0kubun (Takashi Kokubun).

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843

* Author: k0kubun (Takashi Kokubun)
* Status: Open
* Priority: Normal
* Assignee: 
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` usage. Why not use it?

## Proposed operations

1. Announce the timing in this ticket. Do the step 3 at that timing.
2. Change [ruby-commit-hook](https://github.com/ruby/ruby-commit-hook/blob/571e88441e3cc3edb689a1b1798f2685b80f929c/bin/check-email.rb#L51) to accept both `refs/heads/trunk` and `refs/heads/master`.
3. **[Main part] Rename `trunk` to `master`, and make `trunk` a symbolic-ref of `master`.**
  * On git.ruby-lang.org, `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/heads/master && git symbolic-ref refs/heads/trunk refs/heads/master"`
4. [Optional] On git.ruby-lang.org, `sudo -u git bash -c "cd /var/git/ruby.git && git symbolic-ref HEAD refs/heads/master"`
5. [Optional] Trigger GitHub mirror (create master branch on GitHub). On GitHub, change default branch to `master`.

### Expected outcome

* Push to `trunk` branch of git.ruby-lang.org will be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Push to `master` branch of git.ruby-lang.org will also be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Both of `trunk` and `master` branches on GitHub will be always mirrored.

### Out of scope (for a short term)

* Remove `trunk` branch
* Prohibit pushing to `trunk` branch
* Make `trunk` unavailable for clone



-- 
https://bugs.ruby-lang.org/

[ruby-core:92765] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[usa]

Issue #15843 has been updated by usa (Usaku NAKAMURA).


I don't disagree this proposal.
But, I want to know what you mean in the term "Out of scope (for a short term)".
What is "short" ?

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78129

* Author: k0kubun (Takashi Kokubun)
* Status: Open
* Priority: Normal
* Assignee: 
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` usage. Why not use it?

## Proposed operations

1. Announce the timing in this ticket. Do the step 3 at that timing.
2. Change [ruby-commit-hook](https://github.com/ruby/ruby-commit-hook/blob/571e88441e3cc3edb689a1b1798f2685b80f929c/bin/check-email.rb#L51) to accept both `refs/heads/trunk` and `refs/heads/master`.
3. **[Main part] Rename `trunk` to `master`, and make `trunk` a symbolic-ref of `master`.**
  * On git.ruby-lang.org, `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/heads/master && git symbolic-ref refs/heads/trunk refs/heads/master"`
4. [Optional] On git.ruby-lang.org, `sudo -u git bash -c "cd /var/git/ruby.git && git symbolic-ref HEAD refs/heads/master"`
5. [Optional] Trigger GitHub mirror (create master branch on GitHub). On GitHub, change default branch to `master`.

### Expected outcome

* Push to `trunk` branch of git.ruby-lang.org will be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Push to `master` branch of git.ruby-lang.org will also be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Both of `trunk` and `master` branches on GitHub will be always mirrored.

### Out of scope (for a short term)

* Remove `trunk` branch
* Prohibit pushing to `trunk` branch
* Make `trunk` unavailable for clone



-- 
https://bugs.ruby-lang.org/

[ruby-core:92766] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[ko1]

Issue #15843 has been updated by ko1 (Koichi Sasada).


If you change something, pls tell your schedule and we can check the CI system.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78130

* Author: k0kubun (Takashi Kokubun)
* Status: Open
* Priority: Normal
* Assignee: 
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` usage. Why not use it?

## Proposed operations

1. Announce the timing in this ticket. Do the step 3 at that timing.
2. Change [ruby-commit-hook](https://github.com/ruby/ruby-commit-hook/blob/571e88441e3cc3edb689a1b1798f2685b80f929c/bin/check-email.rb#L51) to accept both `refs/heads/trunk` and `refs/heads/master`.
3. **[Main part] Rename `trunk` to `master`, and make `trunk` a symbolic-ref of `master`.**
  * On git.ruby-lang.org, `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/heads/master && git symbolic-ref refs/heads/trunk refs/heads/master"`
4. [Optional] On git.ruby-lang.org, `sudo -u git bash -c "cd /var/git/ruby.git && git symbolic-ref HEAD refs/heads/master"`
5. [Optional] Trigger GitHub mirror (create master branch on GitHub). On GitHub, change default branch to `master`.

### Expected outcome

* Push to `trunk` branch of git.ruby-lang.org will be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Push to `master` branch of git.ruby-lang.org will also be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Both of `trunk` and `master` branches on GitHub will be always mirrored.

### Out of scope (for a short term)

* Remove `trunk` branch
* Prohibit pushing to `trunk` branch
* Make `trunk` unavailable for clone



-- 
https://bugs.ruby-lang.org/

[ruby-core:92767] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[nobu]

Issue #15843 has been updated by nobu (Nobuyoshi Nakada).


I'm negative against the Main part (moving the branch) immediately, which seems a too big change.
Why not making "master" as a symbolic-ref at first?

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78131

* Author: k0kubun (Takashi Kokubun)
* Status: Open
* Priority: Normal
* Assignee: 
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` usage. Why not use it?

## Proposed operations

1. Announce the timing in this ticket. Do the step 3 at that timing.
2. Change [ruby-commit-hook](https://github.com/ruby/ruby-commit-hook/blob/571e88441e3cc3edb689a1b1798f2685b80f929c/bin/check-email.rb#L51) to accept both `refs/heads/trunk` and `refs/heads/master`.
3. **[Main part] Rename `trunk` to `master`, and make `trunk` a symbolic-ref of `master`.**
  * On git.ruby-lang.org, `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/heads/master && git symbolic-ref refs/heads/trunk refs/heads/master"`
4. [Optional] On git.ruby-lang.org, `sudo -u git bash -c "cd /var/git/ruby.git && git symbolic-ref HEAD refs/heads/master"`
5. [Optional] Trigger GitHub mirror (create master branch on GitHub). On GitHub, change default branch to `master`.

### Expected outcome

* Push to `trunk` branch of git.ruby-lang.org will be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Push to `master` branch of git.ruby-lang.org will also be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Both of `trunk` and `master` branches on GitHub will be always mirrored.

### Out of scope (for a short term)

* Remove `trunk` branch
* Prohibit pushing to `trunk` branch
* Make `trunk` unavailable for clone



-- 
https://bugs.ruby-lang.org/

[ruby-core:92783] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).

Description updated

> If you change something, pls tell your schedule and we can check the CI system.

Sure. I updated the description.
Once I make a symbolic-ref tomorrow, I'll post an email to ruby-core to share the schedule and ask for updating CI system to use master branch.

> But, I want to know what do you mean in the term "Out of scope (for a short term)".
> What is "short" ?

I included a concrete schedule for all related operations in the new description. Because @mame is going to make a big change in ruby-commit-hook check-email.rb in 2020, I'm thinking about making the last operation happen at the similar timing.

> I'm negative against the Main part (moving the branch) immediately, which seems a too big change.
> Why not making "master" as a symbolic-ref at first?

The new schedule adopted your proposal. "making `master` as a symbolic-ref at first" will be done tomorrow as the first step.

For "moving the branch", I split the operation to "changing HEAD" and "mv refs/heads/trunk refs/heads/master", and planned to make the former on 2019/7/1 and the latter on 2020/1/1.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78148

* Author: k0kubun (Takashi Kokubun)
* Status: Open
* Priority: Normal
* Assignee: 
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` usage. Why not use it?

## Proposed schedule

* 2019
  * 5/22: Announce this schedule
  * 5/23: Make `master` symbolic-ref pointing to `trunk` on git.ruby-lang.org
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list.
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`
* 2020
  * 1/1: Drop `trunk` branch on git.ruby-lang.org (`mv refs/heads/trunk refs/heads/master` at `/var/git/ruby.git`)



-- 
https://bugs.ruby-lang.org/

[ruby-core:92800] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).

Assignee set to k0kubun (Takashi Kokubun)
Status changed from Open to Assigned

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78174

* Author: k0kubun (Takashi Kokubun)
* Status: Assigned
* Priority: Normal
* Assignee: k0kubun (Takashi Kokubun)
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too)
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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"`



-- 
https://bugs.ruby-lang.org/

[ruby-core:92818] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[duerst]

Issue #15843 has been updated by duerst (Martin Dürst).


Please not only give us a schedule, but tell us exactly (in terms of git commands) what this means for people which are not *totally* familiar with git. Please do NOT assume that everybody "just knows". 

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78191

* Author: k0kubun (Takashi Kokubun)
* Status: Assigned
* Priority: Normal
* Assignee: k0kubun (Takashi Kokubun)
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too)
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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"`



-- 
https://bugs.ruby-lang.org/

Unsubscribe: <mailto:ruby-core-request@ruby-lang.org?subject=unsubscribe>
<http://lists.ruby-lang.org/cgi-bin/mailman/options/ruby-core>

[ruby-core:92825] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).

Description updated

Sorry for your inconvenience, it was originally written in the ticket but I somehow deleted the later edit. I just resurrected the "Expected outcome" section in the original description.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78199

* Author: k0kubun (Takashi Kokubun)
* Status: Assigned
* Priority: Normal
* Assignee: k0kubun (Takashi Kokubun)
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too)
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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

* Push to `trunk` branch of git.ruby-lang.org will be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Push to `master` branch of git.ruby-lang.org will also be reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
* Both of `trunk` and `master` branches on GitHub will be always mirrored.



-- 
https://bugs.ruby-lang.org/

[ruby-core:92826] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[Greg.mpls]

Issue #15843 has been updated by MSP-Greg (Greg L).


Maybe the changes to RUBY_DESCRIPTION (ruby -v) and RUBY_REVISION could be noted somewhere...

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78203

* Author: k0kubun (Takashi Kokubun)
* Status: Assigned
* Priority: Normal
* Assignee: k0kubun (Takashi Kokubun)
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too)
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:92827] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


The thing is commit:a205e24747497391390ef7c004293a8a7934dd96, but that's not related to this ticket. Please comment on #14632 or #15782 instead.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78204

* Author: k0kubun (Takashi Kokubun)
* Status: Assigned
* Priority: Normal
* Assignee: k0kubun (Takashi Kokubun)
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too)
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:93437] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


Log:

```console
k0kubun@svn:/var/git/ruby.git$ pwd
/var/git/ruby.git
k0kubun@svn:/var/git/ruby.git$ cat refs/heads/trunk
c5eb24349a4535948514fe765c3ddb0628d81004
k0kubun@svn:/var/git/ruby.git$ cat refs/heads/master
ref: refs/heads/trunk
k0kubun@svn:/var/git/ruby.git$ sudo -u git bash -c "mv refs/heads/trunk refs/heads/master && git symbolic-ref refs/heads/trunk refs/heads/mast
er"
[sudo] password for k0kubun:
k0kubun@svn:/var/git/ruby.git$ cat refs/heads/master
c5eb24349a4535948514fe765c3ddb0628d81004
k0kubun@svn:/var/git/ruby.git$ cat refs/heads/trunk
ref: refs/heads/master
```

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78982

* Author: k0kubun (Takashi Kokubun)
* Status: Assigned
* Priority: Normal
* Assignee: k0kubun (Takashi Kokubun)
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too)
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:93438] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


Switching "trunk" to "master" in both git.ruby-lang.org/ruby.git and github.com/ruby.git is finished. I'll update some CI configurations and notify some details to you after that.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78983

* Author: k0kubun (Takashi Kokubun)
* Status: Assigned
* Priority: Normal
* Assignee: k0kubun (Takashi Kokubun)
----------------------------------------
## Background

* We're using `trunk` branch as a canonical development branch because it has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too)
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:93440] [Ruby trunk Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).

Status changed from Assigned to Closed

Hi all,

Switching the default branch "trunk" to "master" is successfully completed.
You can continue to git push to trunk, but it's recommended to switch to use master on your local workflow.

For your pull requests on GitHub, if your base revision is newer than commit:3d1536e61812dab1f4c226eb60356fd238ab6bb8, you'd like to  point your PR to master, and trunk otherwise.
This applies to your old PRs too. If you rebase your PR against a revision newer than commit:3d1536e61812dab1f4c226eb60356fd238ab6bb8, that's the time you should switch your PR's merge target from trunk to master.

I'm going to close this ticket now. Though there's still a remaining operation, deleting the trunk branch on Jan 1st, 2020.
From now on, you're encouraged to stop referring to trunk branch at all, while it's supposed to work for about 6 months from now.

Thank you,
k0kubun

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78985

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too)
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:93444] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


In https://bugs.ruby-lang.org/issues/15843#note-16, I forgot to switch git.ruby-lang.org's HEAD to master (but it actually worked maybe because symbolic-ref is recursively resolved). Anyway, now I did:

```console
k0kubun@svn:/var/git/ruby.git$ cat HEAD
ref: refs/heads/trunk
k0kubun@svn:/var/git/ruby.git$ cat refs/heads/trunk
ref: refs/heads/master
k0kubun@svn:/var/git/ruby.git$ cat refs/heads/master
dbe834ab5ac4f90df5db9fc314b45890726cca3b
k0kubun@svn:/var/git/ruby.git$ sudo -u git bash -c "git symbolic-ref HEAD refs/heads/master"
[sudo] password for k0kubun:
k0kubun@svn:/var/git/ruby.git$ cat HEAD
ref: refs/heads/master
k0kubun@svn:/var/git/ruby.git$ cat refs/heads/trunk
ref: refs/heads/master
k0kubun@svn:/var/git/ruby.git$ cat refs/heads/master
dbe834ab5ac4f90df5db9fc314b45890726cca3b
```

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-78990

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:95602] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[duerst]

Issue #15843 has been updated by duerst (Martin Dürst).


For people who haven't yet switched from trunk to master, when you push, you'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 deleted soon.
remote: Please delete your local 'trunk' branch, and use the 'master' branch 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 you have it. Then use 'git checkout -b master remotes/origin/master` to create 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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=unsubscribe>
<http://lists.ruby-lang.org/cgi-bin/mailman/options/ruby-core>

[ruby-core:95676] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[jonathan]

Issue #15843 has been updated by jonathanhefner (Jonathan Hefner).


Related to this change, would it be possible to redirect https://docs.ruby-lang.org/en/trunk/ to https://docs.ruby-lang.org/en/master/ ?  There are links in various third-party docs and online articles which still point to https://docs.ruby-lang.org/en/trunk/.


----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-82463

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:95686] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


I don't have a control on docs.ruby-lang.org. Please file another ticket or issue on https://github.com/ruby/docs.ruby-lang.org/issues to get its maintainer's attention.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-82474

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:96414] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


Reminder to everyone:

> 2020 1/1: trunk branch cannot be git fetched and git pushed anymore.

The ruby.git's "trunk" branch will be deleted within 10 days.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-83339

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:96559] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


Related to this branch rename from "trunk" to "master", we previously renamed the Redmine project name from "Ruby trunk" to "Ruby master". Today, for consistency I also renamed its internal identifier `ruby-trunk` to `ruby-master` which is shown at the Redmine URLs.

For the backward compatibility, I made the following changes:

* Whatever `https://bugs.ruby-lang.org/projects/ruby-trunk/*` is redirected to `https://bugs.ruby-lang.org/projects/ruby-master/*` now
  * Note: With the current implementation, query string is not redirected. However an anchor is redirected and I believe it works in most cases.
  * I left `https://bugs.ruby-lang.org/projects/ruby-trunk/*` URL references (fixed one place in Wiki though) because we have this redirection.
* Changed `project:ruby-trunk` to `project:ruby-master` in Wiki and tickets.
* Changed `[[ruby-trunk:*]]` to `[[ruby-master:*]]` in Wiki and tickets.

Please let me know if you find any trouble related to this.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-83493

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:96609] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


FYI: rvm ruby-head was fixed to use master branch in https://github.com/rvm/rvm/pull/4840 (thanks havenwood!) and therefore Travis ruby-head is also using master branch. I think we have no significant blocker for removing trunk branch anymore. So I'll delete the trunk branch as scheduled.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-83580

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:96611] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


Done

```
k0kubun@svn:/var/git/ruby.git/refs/heads$ cat /var/git/ruby.git/refs/heads/trunk
ref: refs/heads/master
k0kubun@svn:/var/git/ruby.git/refs/heads$ sudo rm /var/git/ruby.git/refs/heads/trunk
```

```
$ git push github :trunk
To github.com:ruby/ruby
 - [deleted]               trunk
```

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-83581

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:96859] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[stowers.joshua]

Issue #15843 has been updated by JustJosh (Joshua Stowers).


The "List of maintainers" link is now broken on this page: https://bugs.ruby-lang.org/projects/ruby/wiki/Maintainers

It currently links to: https://github.com/ruby/ruby/blob/trunk/doc/maintainers.rdoc
instead of: https://github.com/ruby/ruby/blob/master/doc/maintainers.rdoc



----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-83869

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:96865] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[mame]

Issue #15843 has been updated by mame (Yusuke Endoh).


JustJosh (Joshua Stowers) wrote:
> The "List of maintainers" link is now broken on this page: https://bugs.ruby-lang.org/projects/ruby/wiki/Maintainers
> 
> It currently links to: https://github.com/ruby/ruby/blob/trunk/doc/maintainers.rdoc
> instead of: https://github.com/ruby/ruby/blob/master/doc/maintainers.rdoc

Fixed, thanks!

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-83878

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/

[ruby-core:96867] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org

[takashikkbn]

Issue #15843 has been updated by k0kubun (Takashi Kokubun).


Ah that's a good catch. I fixed two similar references in https://bugs.ruby-lang.org/projects/ruby-master/wiki/C99 and https://bugs.ruby-lang.org/projects/ruby-master/wiki/SupportedPlatforms too.

----------------------------------------
Misc #15843: Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org
https://bugs.ruby-lang.org/issues/15843#change-83880

* 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 has been mirrored to there by git-svn.
* In a usual git repository, a HEAD branch is `master` by default. Using `trunk` 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 `trunk` 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.org *(done)*
  * 5/23~6/30: Ask maintainers of CI (or whatever integrated with the repository) to explicitly use `master` branch instead of `trunk` at ruby-core mailing list. *(asked)*
  * 7/1: Switch HEAD on git.ruby-lang.org from `trunk` to `master`, and reverse the symbolic-ref direction (change the default branch of GitHub ruby/ruby to `master` too) *(done)*
     * `sudo -u git bash -c "cd /var/git/ruby.git && mv refs/heads/trunk refs/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 reflected to both `trunk` and `master` branches of git.ruby-lang.org immediately.
     * Both of `trunk` and `master` branches on GitHub will be always mirrored.
  * 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/