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=-3.7 required=3.0 tests=AWL,BAYES_00, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham 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 327C31F462 for ; Wed, 22 May 2019 06:39:26 +0000 (UTC) Received: from neon.ruby-lang.org (localhost [IPv6:::1]) by neon.ruby-lang.org (Postfix) with ESMTP id 5D24F120A05; Wed, 22 May 2019 15:39:21 +0900 (JST) Received: from o1678916x28.outbound-mail.sendgrid.net (o1678916x28.outbound-mail.sendgrid.net [167.89.16.28]) by neon.ruby-lang.org (Postfix) with ESMTPS id 7BC1A120A01 for ; Wed, 22 May 2019 15:39:18 +0900 (JST) Received: by filter0151p3mdw1.sendgrid.net with SMTP id filter0151p3mdw1-29184-5CE4EE98-6 2019-05-22 06:39:20.174010294 +0000 UTC m=+547245.632037240 Received: from herokuapp.com (unknown [3.81.19.97]) by ismtpd0036p1iad1.sendgrid.net (SG) with ESMTP id RlJX3lTAT0ybZQZjDsmHiQ for ; Wed, 22 May 2019 06:39:19.986 +0000 (UTC) Date: Wed, 22 May 2019 06:39:20 +0000 (UTC) From: nobu@ruby-lang.org Message-ID: References: Mime-Version: 1.0 X-Redmine-MailingListIntegration-Message-Ids: 68252 X-Redmine-Project: ruby-trunk X-Redmine-Issue-Id: 15843 X-Redmine-Issue-Author: k0kubun X-Redmine-Sender: nobu 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?q8Dly+pU2+3ektTtZVXgZtbJPXwqo7p86jCsvYTW4BxrtcRwJ2vrL2D5SJpWLi?= =?us-ascii?Q?LG0nW6ewwx1px+1qcZODGiGyuTzh5HEUiDA7Yey?= =?us-ascii?Q?ztYHwfF7KnyD45Nw3+Jm1blYRPt8kH3lK5hXeRK?= =?us-ascii?Q?PqGYRLhDVwmbxTQ9UW4VRQ038TPMRbPoLyTjjlj?= =?us-ascii?Q?lBAMRW4G+zHDNL=2FpcI6g57ZJqLwIFc3K9Dg=3D=3D?= To: ruby-core@ruby-lang.org X-ML-Name: ruby-core X-Mail-Count: 92767 Subject: [ruby-core:92767] [Ruby trunk 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 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/