Swift merge commits no diff


(Vassil Vassilev) #1

Hi,

   I am trying to follow the development of swift more closely recently. I noticed that there is no diff below merge commits of pull requests to swift-commits mailing lists. I'd assume this is intentional, but feels awkward. I was wondering what was the rationale for that?

Many thanks,

Vassil


(Slava Pestov) #2

Hi Vassil,

Since a merge commit has two parents you might potentially want to diff against, I'm assuming the tool is not smart enough to know which one is the PR and which one is trunk. Perhaps this is not too hard to fix with some kind of heuristic though.

Slava

···

On Jun 21, 2016, at 2:49 PM, Vassil Vassilev via swift-dev <swift-dev@swift.org> wrote:

Hi,

I am trying to follow the development of swift more closely recently. I noticed that there is no diff below merge commits of pull requests to swift-commits mailing lists. I'd assume this is intentional, but feels awkward. I was wondering what was the rationale for that?

Many thanks,

Vassil

_______________________________________________
swift-dev mailing list
swift-dev@swift.org
https://lists.swift.org/mailman/listinfo/swift-dev


(Vassil Vassilev) #3

Hi Slava,
   Thanks for explaining. Would this be something useful for others then me?

   It seems the technical issue is solvable by adding a switch to the git-notifier:
"--allchanges <branches>
    Lists branches for which /all/ changes made to them should be mailed
    out as straight diffs to their previous state, independent of
    whether the corresponding commit has already been reported in the
    past. For merge commits, the mails include the full diff (i.e.,
    git's diff -m). This might for example make sense for master if one
    wants to closely track any modification applied. <branches> is a
    list of comma-separated names of heads to treat this way. "

Vassil

···

On 22/06/16 00:53, Slava Pestov wrote:

Hi Vassil,

Since a merge commit has two parents you might potentially want to diff against, I'm assuming the tool is not smart enough to know which one is the PR and which one is trunk. Perhaps this is not too hard to fix with some kind of heuristic though.

Slava

On Jun 21, 2016, at 2:49 PM, Vassil Vassilev via swift-dev <swift-dev@swift.org> wrote:

Hi,

  I am trying to follow the development of swift more closely recently. I noticed that there is no diff below merge commits of pull requests to swift-commits mailing lists. I'd assume this is intentional, but feels awkward. I was wondering what was the rationale for that?

Many thanks,

Vassil

_______________________________________________
swift-dev mailing list
swift-dev@swift.org
https://lists.swift.org/mailman/listinfo/swift-dev