From: takashikkbn@gmail.com
To: ruby-core@ruby-lang.org
Subject: [ruby-core:94306] [Ruby master Misc#16094] Allow only "Rebase and merge" or "Squash and merge" on GitHub, and sync it on git.ruby-lang.org pre-receive hook
Date: Mon, 12 Aug 2019 11:26:41 +0000 (UTC) [thread overview]
Message-ID: <redmine.journal-80655.20190812112640.ba8efe5553cd0731@ruby-lang.org> (raw)
In-Reply-To: redmine.issue-16094.20190810093021@ruby-lang.org
Issue #16094 has been updated by k0kubun (Takashi Kokubun).
Experimentally, I'll move GitHub sync from post-update hook to update hook, which blocks git push a little more. Still most of the behavior would be the same, but you might feel git push became slower.
----------------------------------------
Misc #16094: Allow only "Rebase and merge" or "Squash and merge" on GitHub, and sync it on git.ruby-lang.org pre-receive hook
https://bugs.ruby-lang.org/issues/16094#change-80655
* 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" (suggested by @marcandre) and "Squash and merge" (for editing a commit message as needed) to committers
* Disable "Create a merge commit" in GitHub repository settings, to avoid concerns found in [Misc #16093].
* Also prohibit pushes to the master branch which are not coming from a pull request by requiring CI in GitHub repository settings.
* To allow looking up an associated GitHub pull request from git commands, add `git notes` to "Rebase and merge"d commits in git.ruby-lang.org post-receive hook. (suggested by @nobu)
* 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/
next prev parent reply other threads:[~2019-08-12 11:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <redmine.issue-16094.20190810093021@ruby-lang.org>
2019-08-10 9:30 ` [ruby-core:94247] [Ruby master Misc#16094] Allow only "Rebase and merge" on GitHub and sync it on git.ruby-lang.org pre-receive hook takashikkbn
2019-08-11 3:47 ` [ruby-core:94265] " takashikkbn
2019-08-11 4:16 ` [ruby-core:94266] " nobu
2019-08-11 4:29 ` [ruby-core:94267] " takashikkbn
2019-08-11 7:41 ` [ruby-core:94270] [Ruby master Misc#16094] Allow only "Rebase and merge" or "Squash and merge" on GitHub, " takashikkbn
2019-08-12 8:09 ` [ruby-core:94304] " takashikkbn
2019-08-12 11:26 ` takashikkbn [this message]
2019-08-12 16:53 ` [ruby-core:94307] " takashikkbn
2019-08-13 12:36 ` [ruby-core:94323] " takashikkbn
2019-08-13 20:09 ` [ruby-core:94328] [Ruby master Misc#16094] Allow only "Rebase and merge" or "Squash and merge" on GitHub master branch, and sync it on git.ruby-lang.org update hook samuel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.ruby-lang.org/en/community/mailing-lists/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=redmine.journal-80655.20190812112640.ba8efe5553cd0731@ruby-lang.org \
--to=ruby-core@ruby-lang.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).