You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@netbeans.apache.org by Matthias Bläsing <mb...@doppel-helix.eu> on 2020/05/09 21:45:49 UTC
[DISCUSS] github: Disable squash-and-merge button
Hi,
Hector prototyps an optimized way to give committers on github a better
chance to spot PRs with bad author information (email and/or real
name). The reason is, that github *sarcasm* helpfully */sarcasm* hides
the real author information in the UI and shows only the account
information.
My concerns regarding authorship information were triggered because I
saw bad results from the use of the squash-and-merge button.
My observation was, that a "squash-and-merge" with the github button
replaced the author information of the commits with the _public_
information of the github profile. When the author did not have public
name+email activated it was replaced with some dummy values.
I retested today and in that case it got even worse. I used two email
adresses (author + committer) that were not on github and it ended with
_me_ as the author and noreply@github as committer.
TL;DR version: From my perspective the behavior of the github GUI for
(non-merge-commit) merging is a train-wrack and can only be considered
dangerous if you want to correctly handle authorship.
I suggest to disable the squash-and-merge und rebase-and-merge buttons:
https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories#id-.asf.yamlfeaturesforgitrepositories-Mergebuttons
Important: This is not a discussion about our history handling. A
committer is still free to squash manually (it is not that hard),
rebase or ask the author to squash or just merge as is. It is only
about the GUI function.
Greetings
Matthias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
RE: [DISCUSS] github: Disable squash-and-merge button
Posted by Eirik Bakke <eb...@ultorg.com>.
If the problem can't be fixed in another way, then it makes sense to disable the button. I guess a Travis test will be no help here, because by the time "Squash and Merge" is invoked, the test will already have showed up as green.
> A committer is still free to squash manually (it is not that hard), rebase or ask the author to squash or just merge as is.
I suppose a manual squash may become necessary quite often. Otherwise each PR might generate a long chain of commits, which is unfortunate especially if the first few commits had quality problems that were fixed in later commits at the PR reviewers' request.
-- Eirik
-----Original Message-----
From: Matthias Bläsing <mb...@doppel-helix.eu>
Sent: Saturday, May 9, 2020 5:46 PM
To: dev@netbeans.apache.org
Subject: [DISCUSS] github: Disable squash-and-merge button
Hi,
Hector prototyps an optimized way to give committers on github a better chance to spot PRs with bad author information (email and/or real name). The reason is, that github *sarcasm* helpfully */sarcasm* hides the real author information in the UI and shows only the account information.
My concerns regarding authorship information were triggered because I saw bad results from the use of the squash-and-merge button.
My observation was, that a "squash-and-merge" with the github button replaced the author information of the commits with the _public_ information of the github profile. When the author did not have public
name+email activated it was replaced with some dummy values.
I retested today and in that case it got even worse. I used two email adresses (author + committer) that were not on github and it ended with _me_ as the author and noreply@github as committer.
TL;DR version: From my perspective the behavior of the github GUI for
(non-merge-commit) merging is a train-wrack and can only be considered dangerous if you want to correctly handle authorship.
I suggest to disable the squash-and-merge und rebase-and-merge buttons:
https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories#id-.asf.yamlfeaturesforgitrepositories-Mergebuttons
Important: This is not a discussion about our history handling. A committer is still free to squash manually (it is not that hard), rebase or ask the author to squash or just merge as is. It is only about the GUI function.
Greetings
Matthias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Neil C Smith <ne...@apache.org>.
On Sun, 10 May 2020 at 10:05, Matthias Bläsing
<mb...@doppel-helix.eu> wrote:
> From my POV yes - else I would have not written the mail. Yes it is
> more work, so what? Testing, Evaluating is still more.
Testing, evaluating, etc. is also spread out amongst more people,
particularly during freeze. I'm all for not adding extra overhead if
we don't really need to - it's small but everything adds up.
> Maybe they are not interested in authorship or are only let people
> create PRs, that are committers themselfs.
And maybe we don't assume and actually look into it and not act
differently just for the sake of it?! Learning "best practice", or
more to the point, "what works", from other ASF projects is good IMO.
> > the commit is not the only (or canonical) record of
> > this - there is the pull request and associated email trail that is
> > archived by ASF for this reason.
>
> Sorry but this stupid. Git can hold the correct metadata:
It's not stupid(!), a commit message by itself cannot capture intent
to contribute - this is covered a little in
https://issues.apache.org/jira/browse/LEGAL-156
> This discussion is intended only to cover the broken squash-and-merge
> behaviour of github.
I know. It's far from ideal. The question for me is can we live with
it or not?
Best wishes,
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Matthias Bläsing <mb...@doppel-helix.eu>.
Hi,
Am Sonntag, den 10.05.2020, 09:43 +0100 schrieb Neil C Smith:
> On Sat, 9 May 2020 at 22:46, Matthias Bläsing <
> mblaesing@doppel-helix.eu> wrote:
> > I suggest to disable the squash-and-merge und rebase-and-merge
> > buttons:
>
> I'm -0 to -1 on this change. It has the potential to increase the
> headache for contributions, committers and release managers. Is it
> really necessary?
From my POV yes - else I would have not written the mail. Yes it is
more work, so what? Testing, Evaluating is still more.
> What exactly are the problems and concerns here? I understand the
> immediate issue, and GitHub behaviour isn't ideal (it looks like
> they're actually working on improvements to it). But what exactly
> are
> the ramifications for us?
My problem is
1. the original behaviour _removes_ author information from the commit
- for me this alone is a huge problem
2. the new behaviour replaces authorship claims. To be frank this is
even more messed up. The committer is _not_ the author, even if he
squashed and merges.
> After the discussion on the test PR, I tried to find if this issue
> had
> been raised elsewhere around ASF. I didn't find anything specific,
> but did find quite a few infra issues from projects requesting that
> Squash and Merge be their *only* option. How are they handling it?
> Why do they feel it works for them when we don't feel it works for
> us?
Maybe they are not interested in authorship or are only let people
create PRs, that are committers themselfs. The problem does not exist
(or in a much smaller way) when Comitter == Author. But git explicitly
allows the distinction of the two and github messes that up.
> If tracing authorship of contributions is the only concern, there is
> also the fact that the commit is not the only (or canonical) record
> of
> this - there is the pull request and associated email trail that is
> archived by ASF for this reason. Does this provide all the
> additional
> information required?
Sorry but this stupid. Git can hold the correct metadata:
- who authored
- who committed
The problem is, that github destroys that information (and no squash-
and-merge with a mix of committers is a IMHO a bad idea).
> Does manual squashing and merging still fall foul of the problem with
> PRs not being marked as merged, so missing that part of the audit
> trail too?
Yes it has its own drawbacks, but the commits should still be tied to
the JIRA issue, so there is a line back, but the information in the
commit itself is correct.
I totally have no problem to require authors to squash their commits
and create a sane history, but that is indeed a different discussion.
This discussion is intended only to cover the broken squash-and-merge
behaviour of github.
Greetings
Matthias
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Neil C Smith <ne...@apache.org>.
On Tue, 12 May 2020 at 11:44, Korney Czukowski <cz...@seznam.cz> wrote:
> Perhaps git hooks could be helpful to correct the author/committer names
> during rebase on Github if it turns out being wrong?
Or can we use a .mailmap file, as alluded to earlier? eg.
https://git-scm.com/docs/git-check-mailmap
Searching across ASF repos finds quite a few, including for mapping
private github email addresses. But would it fix all issues here? If
so, it would also help fix up the history?
Best wishes,
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Korney Czukowski <cz...@seznam.cz>.
Perhaps git hooks could be helpful to correct the author/committer names
during rebase on Github if it turns out being wrong? Maybe even also
appending the "paper trail" to commit messages, not unlike with OpenJDK
mentioned above?
For commits with already 'bad' information, like generic no-reply
addresses, it could be checked automatically before Travis.
11.05.2020 20:52, Jan Lahoda wrote:
> So, I looked at some commits, and the outcomes seem to really leave a lot
> to be desired. Names in Author section appear to be preserved, but many
> commits have noreply address there, and quite a few have a generic GitHub
> noreply address in the Commit section. So I guess that if we can do better,
> it would be good if we did. So disabling Squash and Merge sounds like
> something we should try (if it turns out to be too complex/difficult, we
> can always re-enable it). Not sure about rebase - I guess it would be ideal
> if we had a single (correct) squashed commit, which was rebased?
>
> Jan
>
> On Mon, May 11, 2020 at 12:05 PM Neil C Smith <ne...@apache.org> wrote:
>
>> On Sun, 10 May 2020 at 21:05, John Neffenger <jo...@status6.com> wrote:
>>> The commit history is the only record that remains:
>> I wonder if that applies to our pre-ASF commit history?! :-)
>>
>>> 1. independent from any centralized hosting service, be it GitHub,
>>> GitLab, Bitbucket, SourceHut, or wherever else the project may move in
>>> the future, and
>> I was talking about ASF's own "paper" trail, not any third-party service.
>>
>>> There's also the matter that some people, including myself, are very
>>> reluctant to contribute to projects that don't take care to give authors
>>> credit in the commit history.
>> No-one was suggesting otherwise!
>>
>>> Just for a comparison, the OpenJDK ...
>>> Note also that the OpenJDK does not mark its pull requests as Merged
>>> (with the big purple badge) on GitHub. Instead, the tooling ...
>> Different project, infrastructure and requirements (eg. they require
>> contributor agreement).
>>
>> It was an open question if there are implications with regard to our
>> paper trail / GitBox with merging in such a way that the commit is not
>> linked to closing of the PR.
>>
>> Best wishes,
>>
>> Neil
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
>> For additional commands, e-mail: dev-help@netbeans.apache.org
>>
>> For further information about the NetBeans mailing lists, visit:
>> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>>
>>
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Jan Lahoda <la...@gmail.com>.
So, I looked at some commits, and the outcomes seem to really leave a lot
to be desired. Names in Author section appear to be preserved, but many
commits have noreply address there, and quite a few have a generic GitHub
noreply address in the Commit section. So I guess that if we can do better,
it would be good if we did. So disabling Squash and Merge sounds like
something we should try (if it turns out to be too complex/difficult, we
can always re-enable it). Not sure about rebase - I guess it would be ideal
if we had a single (correct) squashed commit, which was rebased?
Jan
On Mon, May 11, 2020 at 12:05 PM Neil C Smith <ne...@apache.org> wrote:
> On Sun, 10 May 2020 at 21:05, John Neffenger <jo...@status6.com> wrote:
> > The commit history is the only record that remains:
>
> I wonder if that applies to our pre-ASF commit history?! :-)
>
> > 1. independent from any centralized hosting service, be it GitHub,
> > GitLab, Bitbucket, SourceHut, or wherever else the project may move in
> > the future, and
>
> I was talking about ASF's own "paper" trail, not any third-party service.
>
> > There's also the matter that some people, including myself, are very
> > reluctant to contribute to projects that don't take care to give authors
> > credit in the commit history.
>
> No-one was suggesting otherwise!
>
> > Just for a comparison, the OpenJDK ...
> > Note also that the OpenJDK does not mark its pull requests as Merged
> > (with the big purple badge) on GitHub. Instead, the tooling ...
>
> Different project, infrastructure and requirements (eg. they require
> contributor agreement).
>
> It was an open question if there are implications with regard to our
> paper trail / GitBox with merging in such a way that the commit is not
> linked to closing of the PR.
>
> Best wishes,
>
> Neil
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: dev-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
>
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Neil C Smith <ne...@apache.org>.
On Sun, 10 May 2020 at 21:05, John Neffenger <jo...@status6.com> wrote:
> The commit history is the only record that remains:
I wonder if that applies to our pre-ASF commit history?! :-)
> 1. independent from any centralized hosting service, be it GitHub,
> GitLab, Bitbucket, SourceHut, or wherever else the project may move in
> the future, and
I was talking about ASF's own "paper" trail, not any third-party service.
> There's also the matter that some people, including myself, are very
> reluctant to contribute to projects that don't take care to give authors
> credit in the commit history.
No-one was suggesting otherwise!
> Just for a comparison, the OpenJDK ...
> Note also that the OpenJDK does not mark its pull requests as Merged
> (with the big purple badge) on GitHub. Instead, the tooling ...
Different project, infrastructure and requirements (eg. they require
contributor agreement).
It was an open question if there are implications with regard to our
paper trail / GitBox with merging in such a way that the commit is not
linked to closing of the PR.
Best wishes,
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by John Neffenger <jo...@status6.com>.
On 5/10/20 1:43 AM, Neil C Smith wrote:
> If tracing authorship of contributions is the only concern, there is
> also the fact that the commit is not the only (or canonical) record of
> this - there is the pull request and associated email trail that is
> archived by ASF for this reason. Does this provide all the additional
> information required?
The commit history is the only record that remains:
1. independent from any centralized hosting service, be it GitHub,
GitLab, Bitbucket, SourceHut, or wherever else the project may move in
the future, and
2. always available off-line with the source code.
I think that makes it pretty canonical.
There's also the matter that some people, including myself, are very
reluctant to contribute to projects that don't take care to give authors
credit in the commit history.
Just for a comparison, the OpenJDK always uses the Author and Commit
fields, but also adds the co-authors and reviewers to the end of the
commit message, when appropriate.
Author:
Commit:
...
Co-authored-by:
Reviewed-by:
See: https://openjdk.java.net/jeps/357
Note also that the OpenJDK does not mark its pull requests as Merged
(with the big purple badge) on GitHub. Instead, the tooling simply
closes the pull request (big red badge), and tags the pull request as
"Integrated" (green tag on the right), essentially merging the pull
request outside of GitHub.
For example:
https://github.com/openjdk/jfx/pull/60
Seems to work well, and authors get permanent credit for their work!
John
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Neil C Smith <ne...@apache.org>.
Hi,
On Sat, 9 May 2020 at 22:46, Matthias Bläsing <mb...@doppel-helix.eu> wrote:
> I suggest to disable the squash-and-merge und rebase-and-merge buttons:
I'm -0 to -1 on this change. It has the potential to increase the
headache for contributions, committers and release managers. Is it
really necessary?
What exactly are the problems and concerns here? I understand the
immediate issue, and GitHub behaviour isn't ideal (it looks like
they're actually working on improvements to it). But what exactly are
the ramifications for us?
After the discussion on the test PR, I tried to find if this issue had
been raised elsewhere around ASF. I didn't find anything specific,
but did find quite a few infra issues from projects requesting that
Squash and Merge be their *only* option. How are they handling it?
Why do they feel it works for them when we don't feel it works for us?
If tracing authorship of contributions is the only concern, there is
also the fact that the commit is not the only (or canonical) record of
this - there is the pull request and associated email trail that is
archived by ASF for this reason. Does this provide all the additional
information required?
Are there other ways of handling this? eg. git mail mapping?
Does manual squashing and merging still fall foul of the problem with
PRs not being marked as merged, so missing that part of the audit
trail too?
Best wishes,
Neil
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Neil C Smith <ne...@apache.org>.
On Tue, 6 Apr 2021, 08:15 antonio, <an...@vieiro.net> wrote:
> c) Otherwise we committers can squash using the command line with the
> detailed instructions that Matthias suggested on 2019-12-12 ([1]).
>
> Am I understading this correctly?
>
Ideally not from step 14. Instead, git push -f to the pull request, then
merge as normal. Obviously good to check with PR author where possible as
you're pushing to their repo. Then they can check, and we don't lose the
link with the PR.
Best wishes,
Neil
>
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by antonio <an...@vieiro.net>.
Hi,
So, if I understand correctly:
a) It's ok to use the squash-and-merge button if contributors have
proper github/email addresses in their github profile (is this so? or do
we want to disable it completely?).
b) Otherwise we prefer that contributors squash themselves (git rebase
-i) and update their PR branch (git push -f).
c) Otherwise we committers can squash using the command line with the
detailed instructions that Matthias suggested on 2019-12-12 ([1]).
Am I understading this correctly?
Thanks,
Antonio
[1]
http://mail-archives.apache.org/mod_mbox/netbeans-dev/201912.mbox/%3C6157b71ba7974359a3d1b9ae83bbb4a0ea2c9b2d.camel%40doppel-helix.eu%3E
El 6/4/21 a las 0:10, Neil C Smith escribió:
> On Mon, 5 Apr 2021, 22:48 antonio, <an...@vieiro.net> wrote:
>
>> Sorry for the late reply.
>>
>> +1 to disable the squash-and-merge button in github.
>>
>
> I'm +1 to this in retrospect too, as long as we also squash and force push
> to PR branches to merge where needed (every committer can by default). I've
> done this with a few where author wanted help. Direct merges to master with
> manually closed PRs cause other issues for us during releases, so can we
> please stop that one?
>
> Best wishes,
>
> Neil
>
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by antonio <an...@vieiro.net>.
Hi again,
It seems you can add two empty lines and the one or more
"Co-authored-by:" lines at the bottom of the commit messages, and then
github properly acknowledges the authors (can't tell if "git blame"
works, though).
I asked in the comdev mailing list [2], and someone from Apache Airflow
said they had automated this in the pull requests (screenshot at [3])
using a combination of a github workflow and a "git mob hook".
I don't know if we can set this up as well, but we may want to try out a
squash-and-merge adding a "Co-authored-by: " next time.
Kind regards,
Antonio
[1]
https://gist.github.com/lisawolderiksen/f9747a3ae1e58e9daa7d176ab98f1bad
[2]
https://mail-archives.apache.org/mod_mbox/community-dev//202104.mbox/%3CCAH067Rn5Nt_SFUQQhJqizUm9irJWYTWH3CeapkO9FWjCe%2BY2sw%40mail.gmail.com%3E
[3]
https://pasteboard.co/JW8pJnQ.png
El 6/4/21 a las 0:10, Neil C Smith escribió:
> On Mon, 5 Apr 2021, 22:48 antonio, <an...@vieiro.net> wrote:
>
>> Sorry for the late reply.
>>
>> +1 to disable the squash-and-merge button in github.
>>
>
> I'm +1 to this in retrospect too, as long as we also squash and force push
> to PR branches to merge where needed (every committer can by default). I've
> done this with a few where author wanted help. Direct merges to master with
> manually closed PRs cause other issues for us during releases, so can we
> please stop that one?
>
> Best wishes,
>
> Neil
>
>>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by Neil C Smith <ne...@apache.org>.
On Mon, 5 Apr 2021, 22:48 antonio, <an...@vieiro.net> wrote:
> Sorry for the late reply.
>
> +1 to disable the squash-and-merge button in github.
>
I'm +1 to this in retrospect too, as long as we also squash and force push
to PR branches to merge where needed (every committer can by default). I've
done this with a few where author wanted help. Direct merges to master with
manually closed PRs cause other issues for us during releases, so can we
please stop that one?
Best wishes,
Neil
>
Re: [DISCUSS] github: Disable squash-and-merge button
Posted by antonio <an...@vieiro.net>.
Hi all,
Sorry for the late reply.
+1 to disable the squash-and-merge button in github.
My reasoning is that:
a) All authors and committers should be properly identified in the git
log. This is useful for historic and legal purposes. In the future we
may want to track who contributed what in case the origins of the source
code are unclear or problematic, for instance.
b) We want to properly acknowledge the effort of any individual that
contributes to the project, wheter a committer or not.
As an example of the problem, you can run:
git log --pretty="format: %an %ae : %cn %ce"
on the master branch. This shows many "GitHub noreply@github.com"
committers, and even weird author names.
As Matthias said, the "squash-and-merge" button should only be accepted
if the user has a public email address on its github profile (I just
checked and mine was hidden, for instance).
Alternatively, we could ask ASF-Infra to set up a git hook in our
repositories that rejects merges with any @github.com email addresses.
Cheers,
Antonio
P.S.: Updated link for disabling these buttons:
https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features#Git.asf.yamlfeatures-Mergebuttons
El 9/5/20 a las 23:45, Matthias Bläsing escribió:
> Hi,
>
> Hector prototyps an optimized way to give committers on github a better
> chance to spot PRs with bad author information (email and/or real
> name). The reason is, that github *sarcasm* helpfully */sarcasm* hides
> the real author information in the UI and shows only the account
> information.
>
> My concerns regarding authorship information were triggered because I
> saw bad results from the use of the squash-and-merge button.
>
> My observation was, that a "squash-and-merge" with the github button
> replaced the author information of the commits with the _public_
> information of the github profile. When the author did not have public
> name+email activated it was replaced with some dummy values.
>
> I retested today and in that case it got even worse. I used two email
> adresses (author + committer) that were not on github and it ended with
> _me_ as the author and noreply@github as committer.
>
> TL;DR version: From my perspective the behavior of the github GUI for
> (non-merge-commit) merging is a train-wrack and can only be considered
> dangerous if you want to correctly handle authorship.
>
> I suggest to disable the squash-and-merge und rebase-and-merge buttons:
>
> https://cwiki.apache.org/confluence/display/INFRA/.asf.yaml+features+for+git+repositories#id-.asf.yamlfeaturesforgitrepositories-Mergebuttons
>
> Important: This is not a discussion about our history handling. A
> committer is still free to squash manually (it is not that hard),
> rebase or ask the author to squash or just merge as is. It is only
> about the GUI function.
>
> Greetings
>
> Matthias
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
> For additional commands, e-mail: dev-help@netbeans.apache.org
>
> For further information about the NetBeans mailing lists, visit:
> https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
>
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@netbeans.apache.org
For additional commands, e-mail: dev-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists