From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS4713 221.184.0.0/13 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from neon.ruby-lang.org (neon.ruby-lang.org [221.186.184.75]) by dcvr.yhbt.net (Postfix) with ESMTP id A49231F463 for ; Wed, 1 Jan 2020 01:59:27 +0000 (UTC) Received: from neon.ruby-lang.org (localhost [IPv6:::1]) by neon.ruby-lang.org (Postfix) with ESMTP id E12FD120927; Wed, 1 Jan 2020 10:59:10 +0900 (JST) Received: from o1678948x4.outbound-mail.sendgrid.net (o1678948x4.outbound-mail.sendgrid.net [167.89.48.4]) by neon.ruby-lang.org (Postfix) with ESMTPS id A8A62120903 for ; Wed, 1 Jan 2020 10:59:08 +0900 (JST) Received: by filterdrecv-p3las1-5bf99c48d-92c98 with SMTP id filterdrecv-p3las1-5bf99c48d-92c98-20-5E0BFCF3-2 2020-01-01 01:59:15.097804552 +0000 UTC m=+1300411.069084691 Received: from herokuapp.com (unknown [54.196.3.15]) by ismtpd0003p1iad2.sendgrid.net (SG) with ESMTP id Sp2bobr1RGqbjKHkB0E6kw for ; Wed, 01 Jan 2020 01:59:14.990 +0000 (UTC) Date: Wed, 01 Jan 2020 01:59:15 +0000 (UTC) From: takashikkbn@gmail.com Message-ID: References: Mime-Version: 1.0 X-Redmine-MailingListIntegration-Message-Ids: 72272 X-Redmine-Project: ruby-master X-Redmine-Issue-Id: 15843 X-Redmine-Issue-Author: k0kubun X-Redmine-Issue-Assignee: k0kubun X-Redmine-Sender: k0kubun X-Mailer: Redmine X-Redmine-Host: bugs.ruby-lang.org X-Redmine-Site: Ruby Issue Tracking System X-Auto-Response-Suppress: All Auto-Submitted: auto-generated X-SG-EID: =?us-ascii?Q?9bN4wU0cxWeLAEOz6NELGbwCNAokUg6cnjH8nvx=2Fqgass3ZXnL8VgVvkVt2YND?= =?us-ascii?Q?NRqeOsI1AFO6TQWitlVKzyPXFK9ds7X7RtU1b4o?= =?us-ascii?Q?yZKioGJfDNym8UL5wybcWPdXIqfuFB5BxVVL63I?= =?us-ascii?Q?yQPSlsJXkxhsz6uzalpLeo6alftZwKpOtByckWh?= =?us-ascii?Q?T7pNE1LcBzX8rlisZjPfyddCNo2r56cEKUcJyOs?= =?us-ascii?Q?Q5be90Fa99n6C7CnQ=3D?= To: ruby-core@ruby-lang.org X-ML-Name: ruby-core X-Mail-Count: 96609 Subject: [ruby-core:96609] [Ruby master Misc#15843] Make "trunk" a symbolic-ref of "master" on git.ruby-lang.org X-BeenThere: ruby-core@ruby-lang.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Ruby developers List-Id: Ruby developers List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ruby-core-bounces@ruby-lang.org Sender: "ruby-core" 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/