пн, 5 апр. 2021 г. в 23:02, antonio <anto...@vieiro.net>:
>
> Hi all,
>
> First of all, apologies if this is not the proper list to ask these sort
> of questions. If this is the case I'd appreciate some guidance on who to
> ask these questions.
>
> It seems github automatically changes author [1] and contributor [2]
> details when one presses the "Squash and Merge" button, replacing these
> with the author name and email (if present) of the Github account (and
> with "GitHub nore...@github.com" otherwise).
>
> We discussed this in our mailing list a while back ([4], [5]) with no
> clear consensus.
>
> The questions are:
>
> 1. Is there an ASF-wide policy (or consensus) on how to handle this
> "Squash & Merge" feature in github? Or is this a project-specific decision?
>
> 2. Does the ASF want to keep track of contributor names/emails when PRs
> are received+squashed+merged via github or is this Github behaviour ok?
Historically,
Git is not the first source code management or version control
software used at the ASF. It was preceded by Subversion (now Apache
Subversion), and earlier by CVS. In those times contributions were
proposed as patch files, and there was no such problem that you are
facing now.
As such, many projects have a separate place where contributions are
credited: a changelog file. There is also a custom to provide credit
in a commit message (e.g. "patch provided by ...") Using "squash" is
essentially equivalent to committing a patch file.
In general, a contribution is a collaborative effort both of the
original author of the change and of reviewers from the community. The
author is not the only one responsible here. (As an example, in Apache
Tomcat we do not allow @author tags in contributions.)
Also, in general the contributions should be traceable via mailing
lists archives. ("If it did not happen on a mailing list, it did not
happen." [1])
[1]
https://community.apache.org/newbiefaq.html#is-there-a-code-of-conduct-for-apache-projects
Thus,
> 1. Is there an ASF-wide policy (or consensus) on how to handle this
> "Squash & Merge" feature in github? Or is this a project-specific decision?
A project-specific decision.
A PMC is the one responsible for managing a project.
> 2. Does the ASF want to keep track of contributor names/emails when PRs
> are received+squashed+merged via github
That is not the only way to track a contribution.
> or is this Github behaviour ok?
If you are allowed to edit the commit message and thus credit the
original author then it is OK.
If not, then it is broken.
Generally, it is possible to rewrite a project's history ("git commit
--amend" to edit a commit message, followed by a forced push). It has
consequences, it is frowned upon, but it is technically possible.
It is also possible to create an empty commit (containing only a
commit message and no code changes) if you want to add something to a
project history.
HTH.
Best regards,
Konstantin Kolinko,
a committer and PMC member in Apache Tomcat and Apache Gump.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@community.apache.org
For additional commands, e-mail: dev-h...@community.apache.org
