Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [incubation] Contributions via GitHub, how to handle squash commits

Thanks for the answers so far. I probably didn't make myself clear.
So I will follow up on that:

1) When does a contributor needs to "sign-off" a commit.

The ip-validation give a green light if at least one commit was signed-off.
E.g.
	https://github.com/eclipse/n4js/pull/77

The contributor (szarnekow) didn't signed off all commits. We were still able to (squash) merge the commit.

My question basically is: What is required (by the ip-validation) to give a green light?

2) How are "Squash and Merge" commits recognized by the ip-tooling?

Apparently the ip-tooling is aware of "Squash and Merge" commits. We ONLY use squash-and-merge commits. E.g.

https://github.com/eclipse/n4js/commit/a801ef49386cc13c156ebf2a4dd8eceb9b8c91cf

In the Who's involved section of the project page, all contributors are listed: https://projects.eclipse.org/projects/technology.n4js/who

The can be further analyzed when creating an IP log. The commit above is listed as

Brian Thomas Smith (1 contribution)
a801ef 70,480 lines 07/21/2017 #85: Update (prepared) download section of N4JS webpage (#86)

which is correctly assigned to the contributor.

Unfortunately this is where the "everything works fine" seems to stop.
In our generated IP log,
- I see the "Squash and Merge" commits correctly assigned to the contributors
- I see some commits assigned to committers. (to different branches)
- I do not see a lot of other commits (from committers)

"Any commit that was authored by non-committers are automatically listed. Please see Handling Git Contributions to ensure that Git commits are properly structured." [https://wiki.eclipse.org/PMI/IP_Log_Generator]

The "Handling Git" [https://wiki.eclipse.org/Development_Resources/Handling_Git_Contributions#Git] doesn't explain our IP log result. At least in our case, a lot of commits from committers are listed as "contributions".

What are the rules in the IP-tooling to create the IP-log? What do I need to keep in mind when using "Squash and Merge" commits? Should also committers work on forks instead of branches to keep the IP-log short?
Or are there simply bugs in the IP-log generator?

Best regards,
Jens



Back to the top