On Sun, Jun 2, 2019 at 1:04 PM sebb <seb...@gmail.com> wrote:
>
> On Sun, 2 Jun 2019 at 14:01, Sam Ruby <ru...@intertwingly.net> wrote:
> >
> > On Sun, Jun 2, 2019 at 8:53 AM Shane Curcuru <a...@shanecurcuru.org> wrote:
> > >
> > > sebb wrote on 2019-6-2 8:44AM EDT:
> > > > Top posting
> > > >
> > > > The actual changes to the files below are not detailed anywhere in the
> > > > commits list AFAICT.
> > > > This makes CTR rather hard.
> > > >
> > > > I think this is due to a problem with interpreting GitHub messages.
> > > >
> > > > @Shane Curcuru are you committing to github or gitbox.a.o?
> > >
> > > I used the GitHub website UI to look at Matt's PR, review the changes,
> > > and push the pretty green Merge button.
> > >
> > > > I only use gitbox, and AFAIK all my commit diffs are shown
> > >
> > > I only use the GitHub Desktop to do my own personal work, and it then
> > > pushes to GitHub.
> > >
> > > > Until such time as the commit mails are sorted out would it be
> > > > possible for people to use gitbox instead of GitHub? Or will that
> > > > cause problems?
> > >
> > > If the PMC decides on only gitbox, that's fine; but in the short term I
> > > won't be looking at PRs to review since I've never really used gitbox
> > > directly, so I'll have to figure it out first.
> >
> > Pull requests and GitHub Desktop are two good use cases for using
> > github directly.
>
> Agreed.
>
> > I use the command line so switching would be easy, but then again, I
> > do a rebase before pushing, and so I don't encounter the problem.
>
> Are you saying that the diffs would be OK if Shane did a rebase before 
> pushing?

I haven't seen a problem with my commits.  Have you?

I don't know how to cause the "pretty green Merge button" to do a rebase.

> > While the notifications clearly could be improved, the actual diffs
> > can be easily found by going to
> > https://github.com/apache/whimsy/commits/master
>
> It's possible, but somewhat tedious, so if a rebase would fix this
> then it would be worth trying.

The code to send out the diffs is in the infrastructure-puppet repository:

https://github.com/apache/infrastructure-puppet/blob/deployment/modules/gitbox/files/hooks/post-receive.d/02-send-emails.py

This makes use of https://github.com/git-multimail/git-multimail

Perhaps the focus should be on fixing rather than avoiding the problem?

- Sam Ruby

> > > --
> > >
> > > - Shane
> > >   Grew Up On GUI
> > >   The Apache Software Foundation
> >
> > - Sam Ruby
> >
> > > > S.
> > > >
> > > > On Sun, 2 Jun 2019 at 13:27, <curc...@apache.org> wrote:
> > > >>
> > > >> This is an automated email from the ASF dual-hosted git repository.
> > > >>
> > > >> curcuru pushed a change to branch master
> > > >> in repository https://gitbox.apache.org/repos/asf/whimsy.git.
> > > >>
> > > >>
> > > >>     from 969ec5c  Merge pull request #67 from jvz/docs-update
> > > >>      new 83d78d7  Fix typo
> > > >>      new 9e39e75  Use https URLs
> > > >>      new 503d4e7  Use sks-keyservers.net instead of pgp.mit.edu
> > > >>      new 37234f9  Add .rakeTasks to gitignore
> > > >>      new 57d74f5  Merge pull request #68 from jvz/code-cleanups
> > > >>
> > > >> The 5281 revisions listed above as "new" are entirely new to this
> > > >> repository and will be described in separate emails.  The revisions
> > > >> listed as "add" were already present in the repository and have only
> > > >> been added to this reference.
> > > >>
> > > >>
> > > >> Summary of changes:
> > > >>  .gitignore                                                   | 1 +
> > > >>  www/secretary/workbench/templates/icla-account-requested.erb | 2 +-
> > > >>  www/secretary/workbench/templates/icla-invalid-id.erb        | 2 +-
> > > >>  www/secretary/workbench/templates/icla-pmc-notified.erb      | 2 +-
> > > >>  www/secretary/workbench/templates/icla.erb                   | 2 +-
> > > >>  www/secretary/workbench/templates/incomplete.erb             | 2 +-
> > > >>  www/secretary/workbench/templates/pubkey.erb                 | 3 ++-
> > > >>  www/secretary/workbench/templates/unsigned.erb               | 4 ++--
> > > >>  8 files changed, 10 insertions(+), 8 deletions(-)
> > > >>
> > >

Reply via email to