On Sun, 2 Jun 2019 at 18:32, Sam Ruby <ru...@intertwingly.net> wrote:
>
> 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've not noticed any.

I've just found one of Shane's that has the diff:
https://lists.apache.org/thread.html/53eab686658b569e5bca28c90f52cd4af98044e534c96e0a33360dd2@%3Ccommits.whimsical.apache.org%3E

That was a 'clean' commit.

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

So how do you do the 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?

Well, yes, but this has been going on for many months [1], [2], [3],
without any sign of a fix.

So if there is a simple work-round that can avoid the problem in the
meantime, maybe Shane can use it?

Sebb.
[1] 
https://lists.apache.org/thread.html/d1aa972b7923bfdaa3361c0e7385bcb9a58cbb7b0a0556eb0e183333@%3Cprivate.infra.apache.org%3E
[2] 
https://lists.apache.org/thread.html/a56c976355678640dbc5501387a2117a7f11da5a63795089ca741081@%3Cprivate.infra.apache.org%3E
[3] 
https://lists.apache.org/thread.html/9a8af6f48c02d456fd218dec39c9d7908c347f365b014c6d8ea0de6b@%3Cprivate.infra.apache.org%3E

Reply via email to