So far, so good. We can merge with the merge button! Beware that GitHub now apparently provides two fields for the merge commit message. This threw me at first (isn't there only one message for a commit?) but it's really all for the same message. The first field is the first line, while the second, multi-line field is for an optional extended description to be included after a blank line in the same message.
There seems to be some issues with the way emails, etc. work: 1) Once merged, the email from GitBox alerting to the merge introduces/complains about GitHub behavior twice. Based on how it's worded, it looks like this was two attempts to say the same thing, only one of which was meant to be kept: "[absolute ton of blank lines] This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): [the diff]" 2) GitBox automatically comments on the associated JIRA issue with an incorrect / partly useless comment saying that the committer that merged the PR commented on the PR: "mike-jumper commented on pull request #351: GUACAMOLE-683: Add OpenID support in Docker Build Scripts URL: https://github.com/apache/guacamole-client/pull/351 ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org" (see https://issues.apache.org/jira/browse/GUACAMOLE-683?focusedCommentId=16741527&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-16741527 ) It'd be nice if GitHub integration for JIRA were installed rather than having a bot comment on issues. The GitHub integration maintains a nice, unobtrusive list of relevant commits and the status of associated pull requests. I'm not sure why it's necessary to have an in-house bot comment and create links when a polished integration for JIRA already exists. 3) No emails containing the actual commits are sent out to commits@. There is an email regarding the pull request closure that goes to commits@ and others for the various commits, but those only the diff statistics and commit message, not the diff/commit itself. There is one message that does contain the entire diff (the one mentioned in #1 above), but it goes to dev@ and contains the entire diff. Whatever happened to the old functionality where there was one email per commit sent to commits@? Doesn't git provide its own commit to email mapping out-of-the-box? I'd think that there would be email-formatted diffs for the new commits sent to commits@, and a simple message (no diff) noting the fact that PR was merged sent to dev@. - Mike On Sun, Jan 13, 2019 at 1:22 AM Jean-Baptiste Onofré <j...@nanthrax.net> wrote: > Done, the repositories are now on gitbox. > > You just have to update the git remote. > > Regards > JB > > On 12/01/2019 21:11, Nick Couchman wrote: > > On Fri, Jan 11, 2019 at 1:44 AM Mike Jumper <mjum...@apache.org> wrote: > > > >> On Thu, Jan 10, 2019, 22:29 Jean-Baptiste Onofré <j...@nanthrax.net > wrote: > >> > >>> Hi, > >>> > >>> No problem to do it now. It's very fast (let's 5 minutes) and smooth ;) > >>> > >>> Do you want me to create a Jira for INFRA ? > >>> > >> > >> Sure! Thanks, JB. > >> > >> - Mike > >> > > > > Thanks for doing this, JB. Any word on the timeline for it (maybe it's > > already done)? > > > > -Nick > > > > -- > Jean-Baptiste Onofré > jbono...@apache.org > http://blog.nanthrax.net > Talend - http://www.talend.com >
