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.6 required=3.0 tests=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 D9CE41F731 for ; Sun, 11 Aug 2019 03:48:01 +0000 (UTC) Received: from neon.ruby-lang.org (localhost [IPv6:::1]) by neon.ruby-lang.org (Postfix) with ESMTP id 15205120B9C; Sun, 11 Aug 2019 12:47:53 +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 10D5C120B7F for ; Sun, 11 Aug 2019 12:47:49 +0900 (JST) Received: by filter0105p3las1.sendgrid.net with SMTP id filter0105p3las1-18192-5D4F8FE8-21 2019-08-11 03:47:52.714751948 +0000 UTC m=+1326201.163450897 Received: from herokuapp.com (unknown [34.207.201.52]) by ismtpd0015p1iad1.sendgrid.net (SG) with ESMTP id 0zi7dkKMSyOcyorgS3-1Hg for ; Sun, 11 Aug 2019 03:47:52.644 +0000 (UTC) Date: Sun, 11 Aug 2019 03:47:52 +0000 (UTC) From: takashikkbn@gmail.com Message-ID: References: Mime-Version: 1.0 X-Redmine-MailingListIntegration-Message-Ids: 69810 X-Redmine-Project: ruby-trunk X-Redmine-Issue-Id: 16094 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=2FqgYUHPWN=2FF=2FP9H9ETqWf0w?= =?us-ascii?Q?71OThNSJgDrAiaN4qBbE7va0Lpm10dH4R9Qcg6v?= =?us-ascii?Q?qhBS8XtPf+EKxgWjd1Ii4ABmw6aW+u96pYUC9bJ?= =?us-ascii?Q?o+VOqDMPVADdVAmJ2NNGCXe6wXjJx+cDM+nYu=2Fb?= =?us-ascii?Q?hfAhb7Hk9rmoRZNbdqydYxji9GLnF0i1IQQ=3D=3D?= To: ruby-core@ruby-lang.org X-ML-Name: ruby-core X-Mail-Count: 94265 Subject: [ruby-core:94265] [Ruby master Misc#16094] Allow only "Rebase and merge" on GitHub and sync it on git.ruby-lang.org pre-receive hook 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 #16094 has been updated by k0kubun (Takashi Kokubun). Assignee set to k0kubun (Takashi Kokubun) ---------------------------------------- Misc #16094: Allow only "Rebase and merge" on GitHub and sync it on git.ruby-lang.org pre-receive hook https://bugs.ruby-lang.org/issues/16094#change-80587 * Author: k0kubun (Takashi Kokubun) * Status: Open * Priority: Normal * Assignee: k0kubun (Takashi Kokubun) ---------------------------------------- ## Problem * Our pull request merge strategy confuses contributors, as described in [Misc #16093]. * In [Misc #16093], some committers did not like accepting a merge commit. ## Solution * Allow using GitHub's "Rebase and merge" to committers, as suggested by @marcandre * Disable other merge modes like "Create a merge commit" and "Squash and merge" in GitHub repository settings. * Also prohibit pushes to the master branch which are not coming from a pull request by requiring CI in GitHub repository settings. * Perform GitHub bidirectional sync on git.ruby-lang.org pre-receive hook, and accept a push if it does not conflict with "Rebase and merge" on GitHub. ## Notes * Even after implementing this ticket, the Ruby's canonical Git repository will continue to be git.ruby-lang.org as is. * All committers must push non-pull-request commits to git.ruby-lang.org. Direct pushes to GitHub will continue to be disabled. * This approach has one drawback; `git push` to git.ruby-lang.org might block longer than now. -- https://bugs.ruby-lang.org/